asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed match test expression for temporaries

Browse source 
Fixed that a potentially popped temporary was used for the value in
match statements.
This commit is contained in:
David Sichma 2021-03-12 15:04:45 +01:00
parent adf233ed04
commit 762bb5843b
No known key found for this signature in database
GPG key ID: EA1E0AEEE04FD212
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/gdscript/gdscript_compiler.cpp
View file

@ -1511,17 +1511,17 @@ Error GDScriptCompiler::_parse_block(CodeGen &codegen, const GDScriptParser::Sui
codegen.start_block(); codegen.start_block();
// Evaluate the match expression. // Evaluate the match expression.
GDScriptCodeGenerator::Address value_local = codegen.add_local("@match_value", _gdtype_from_datatype(match->test->get_datatype())); GDScriptCodeGenerator::Address value = codegen.add_local("@match_value", _gdtype_from_datatype(match->test->get_datatype()));
GDScriptCodeGenerator::Address value = _parse_expression(codegen, error, match->test); GDScriptCodeGenerator::Address value_expr = _parse_expression(codegen, error, match->test);
if (error) { if (error) {
return error; return error;
} }
// Assign to local. // Assign to local.
// TODO: This can be improved by passing the target to parse_expression(). // TODO: This can be improved by passing the target to parse_expression().
gen->write_assign(value_local, value); gen->write_assign(value, value_expr);
if (value.mode == GDScriptCodeGenerator::Address::TEMPORARY) { if (value_expr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
codegen.generator->pop_temporary(); codegen.generator->pop_temporary();
} }