godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42067 from ThakeeNathees/for-loop-stack-overriden-fix 

GDScript: for loop override stack variable bug fix
This commit is contained in:
George Marques 2020-10-19 20:21:14 -03:00 committed by GitHub
parent 84e900830a 119936d939
commit 5ddfc657ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gdscript_byte_codegen.cpp
View File

@ -580,8 +580,8 @@ void GDScriptByteCodeGenerator::write_endif() {
} }
void GDScriptByteCodeGenerator::write_for(const Address &p_variable, const Address &p_list) { void GDScriptByteCodeGenerator::write_for(const Address &p_variable, const Address &p_list) {
int counter_pos = increase_stack() | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS); int counter_pos = add_temporary() | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
int container_pos = increase_stack() | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS); int container_pos = add_temporary() | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
current_breaks_to_patch.push_back(List<int>()); current_breaks_to_patch.push_back(List<int>());
@ -629,7 +629,9 @@ void GDScriptByteCodeGenerator::write_endfor() {
} }
current_breaks_to_patch.pop_back(); current_breaks_to_patch.pop_back();
current_stack_size -= 2; // Remove loop temporaries. // Remove loop temporaries.
pop_temporary();
pop_temporary();
} }
void GDScriptByteCodeGenerator::start_while_condition() { void GDScriptByteCodeGenerator::start_while_condition() {