fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-04-26 15:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix missing autorelease in trampolines

Browse Source
This commit is contained in:
dcode 2019-06-04 06:18:51 +02:00
parent e80ca1034f
commit 27e54ed07b
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/compiler.ts
View File

@ -6354,8 +6354,8 @@ export class Compiler extends DiagnosticEmitter {
var originalName = original.internalName; var originalName = original.internalName;
var originalParameterTypes = originalSignature.parameterTypes; var originalParameterTypes = originalSignature.parameterTypes;
var originalParameterDeclarations = original.prototype.signatureNode.parameters; var originalParameterDeclarations = original.prototype.signatureNode.parameters;
var commonReturnType = originalSignature.returnType; var returnType = originalSignature.returnType;
var commonThisType = originalSignature.thisType; var thisType = originalSignature.thisType;
var isInstance = original.is(CommonFlags.INSTANCE); var isInstance = original.is(CommonFlags.INSTANCE);
// arguments excl. `this`, operands incl. `this` // arguments excl. `this`, operands incl. `this`
@ -6386,7 +6386,7 @@ export class Compiler extends DiagnosticEmitter {
assert(operandIndex == minOperands); assert(operandIndex == minOperands);
// create the trampoline element // create the trampoline element
var trampolineSignature = new Signature(originalParameterTypes, commonReturnType, commonThisType); var trampolineSignature = new Signature(originalParameterTypes, returnType, thisType);
trampolineSignature.requiredParameters = maxArguments; trampolineSignature.requiredParameters = maxArguments;
trampolineSignature.parameterNames = originalSignature.parameterNames; trampolineSignature.parameterNames = originalSignature.parameterNames;
trampoline = new Function( trampoline = new Function(
@ -6401,7 +6401,8 @@ export class Compiler extends DiagnosticEmitter {
// compile initializers of omitted arguments in scope of the trampoline function // compile initializers of omitted arguments in scope of the trampoline function
// this is necessary because initializers might need additional locals and a proper this context // this is necessary because initializers might need additional locals and a proper this context
var previousFlow = this.currentFlow; var previousFlow = this.currentFlow;
this.currentFlow = trampoline.flow; var flow = trampoline.flow;
this.currentFlow = flow;
// create a br_table switching over the number of optional parameters provided // create a br_table switching over the number of optional parameters provided
var numNames = numOptional + 1; // incl. outer block var numNames = numOptional + 1; // incl. outer block
@ -6452,25 +6453,28 @@ export class Compiler extends DiagnosticEmitter {
]); ]);
forwardedOperands[operandIndex] = module.local_get(operandIndex, type.toNativeType()); forwardedOperands[operandIndex] = module.local_get(operandIndex, type.toNativeType());
} }
this.currentFlow = previousFlow;
assert(operandIndex == maxOperands); assert(operandIndex == maxOperands);
var stmts: ExpressionRef[] = [ body ];
var theCall = module.call(originalName, forwardedOperands, returnType.toNativeType());
if (returnType != Type.void) {
this.performAutoreleasesWithValue(flow, theCall, returnType, stmts);
} else {
stmts.push(theCall);
this.performAutoreleases(flow, stmts);
}
flow.freeScopedLocals();
this.currentFlow = previousFlow;
var funcRef = module.addFunction( var funcRef = module.addFunction(
trampoline.internalName, trampoline.internalName,
this.ensureFunctionType( this.ensureFunctionType(
trampolineSignature.parameterTypes, trampolineSignature.parameterTypes,
trampolineSignature.returnType, returnType,
trampolineSignature.thisType thisType
), ),
typesToNativeTypes(trampoline.additionalLocals), typesToNativeTypes(trampoline.additionalLocals),
module.block(null, [ module.block(null, stmts, returnType.toNativeType())
body,
module.call(
originalName,
forwardedOperands,
commonReturnType.toNativeType()
)
], commonReturnType.toNativeType())
); );
trampoline.finalize(module, funcRef); trampoline.finalize(module, funcRef);
return trampoline; return trampoline;