zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-13 07:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The return checking code must be inside the nullptr check for item.code.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-05 18:56:04 +01:00
parent 0851d698de
commit 0f9ebff3ee
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/scripting/vm/vmbuilder.cpp
View file

@ -715,13 +715,6 @@ void FFunctionBuildList::Build()
FScriptPosition::StrictErrors = !item.FromDecorate; FScriptPosition::StrictErrors = !item.FromDecorate;
item.Code = item.Code->Resolve(ctx); item.Code = item.Code->Resolve(ctx);
if (!item.Code->CheckReturn())
{
auto newcmpd = new FxCompoundStatement(item.Code->ScriptPosition);
newcmpd->Add(item.Code);
newcmpd->Add(new FxReturnStatement(nullptr, item.Code->ScriptPosition));
item.Code = newcmpd->Resolve(ctx);
}
item.Proto = ctx.ReturnProto; item.Proto = ctx.ReturnProto;
// Make sure resolving it didn't obliterate it. // Make sure resolving it didn't obliterate it.
@ -729,6 +722,14 @@ void FFunctionBuildList::Build()
{ {
assert(item.Proto != nullptr); assert(item.Proto != nullptr);
if (!item.Code->CheckReturn())
{
auto newcmpd = new FxCompoundStatement(item.Code->ScriptPosition);
newcmpd->Add(item.Code);
newcmpd->Add(new FxReturnStatement(nullptr, item.Code->ScriptPosition));
item.Code = newcmpd->Resolve(ctx);
}
// Generate prototype for anonymous functions. // Generate prototype for anonymous functions.
VMScriptFunction *sfunc = item.Function; VMScriptFunction *sfunc = item.Function;
// create a new prototype from the now known return type and the argument list of the function's template prototype. // create a new prototype from the now known return type and the argument list of the function's template prototype.