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

- fixed: For named functions the prototype needs to be set before the code generator starts resolving. Otherwise it will crash on incompletely set up forward declarations.

Browse source
This commit is contained in:
Christoph Oelckers 2016-10-30 16:21:44 +01:00
parent f8ccda2dc8
commit a652c5f259
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -673,6 +673,13 @@ VMFunction *FFunctionBuildList::AddFunction(PFunction *functype, FxExpression *c
it.Function->ImplicitArgs = functype->GetImplicitArgs(); it.Function->ImplicitArgs = functype->GetImplicitArgs();
it.Proto = nullptr; it.Proto = nullptr;
it.FromDecorate = fromdecorate; it.FromDecorate = fromdecorate;
// set prototype for named functions.
if (it.Func->SymbolName != NAME_None)
{
it.Function->Proto = it.Func->Variants[0].Proto;
}
mItems.Push(it); mItems.Push(it);
return it.Function; return it.Function;
} }
@ -714,10 +721,13 @@ void FFunctionBuildList::Build()
{ {
assert(item.Proto != nullptr); assert(item.Proto != nullptr);
// Generate prototype for this anonymous function // 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.
if (sfunc->Proto == nullptr)
{
sfunc->Proto = NewPrototype(item.Proto->ReturnTypes, item.Func->Variants[0].Proto->ArgumentTypes); sfunc->Proto = NewPrototype(item.Proto->ReturnTypes, item.Func->Variants[0].Proto->ArgumentTypes);
}
// Emit code // Emit code
item.Code->Emit(&buildit); item.Code->Emit(&buildit);