zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-27 22:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: a register from a return statement's value would not be freed

Browse source
This commit is contained in:
Leonard2 2016-08-14 19:23:28 +02:00 committed by Christoph Oelckers
parent aa2ca77412
commit e93b64f249
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/thingdef/thingdef_expression.cpp
View file

@ -4757,6 +4757,8 @@ FxExpression *FxReturnStatement::Resolve(FCompileContext &ctx)
ExpEmit FxReturnStatement::Emit(VMFunctionBuilder *build) ExpEmit FxReturnStatement::Emit(VMFunctionBuilder *build)
{ {
ExpEmit out(0, REGT_NIL);
// If we return nothing, use a regular RET opcode. // If we return nothing, use a regular RET opcode.
// Otherwise just return the value we're given. // Otherwise just return the value we're given.
if (Value == nullptr) if (Value == nullptr)
@ -4765,11 +4767,11 @@ ExpEmit FxReturnStatement::Emit(VMFunctionBuilder *build)
} }
else else
{ {
ExpEmit ret = Value->Emit(build); out = Value->Emit(build);
// Check if it is a function call that simplified itself // Check if it is a function call that simplified itself
// into a tail call in which case we don't emit anything. // into a tail call in which case we don't emit anything.
if (!ret.Final) if (!out.Final)
{ {
if (Value->ValueType == TypeVoid) if (Value->ValueType == TypeVoid)
{ // Nothing is returned. { // Nothing is returned.
@ -4777,12 +4779,11 @@ ExpEmit FxReturnStatement::Emit(VMFunctionBuilder *build)
} }
else else
{ {
build->Emit(OP_RET, RET_FINAL, ret.RegType | (ret.Konst ? REGT_KONST : 0), ret.RegNum); build->Emit(OP_RET, RET_FINAL, out.RegType | (out.Konst ? REGT_KONST : 0), out.RegNum);
} }
} }
} }
ExpEmit out;
out.Final = true; out.Final = true;
return out; return out;
} }