Skip to content

Make sure the ~argumentsLength global exists #1676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2021
Merged

Make sure the ~argumentsLength global exists #1676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ export class Compiler extends DiagnosticEmitter {
// expose the arguments length helper if there are varargs exports
if (this.runtimeFeatures & RuntimeFeatures.setArgumentsLength) {
module.addFunction(BuiltinNames.setArgumentsLength, NativeType.I32, NativeType.None, null,
module.global_set(BuiltinNames.argumentsLength, module.local_get(0, NativeType.I32))
module.global_set(this.ensureArgumentsLength(), module.local_get(0, NativeType.I32))
);
module.addFunctionExport(BuiltinNames.setArgumentsLength, ExportNames.setArgumentsLength);
}
Expand Down Expand Up @@ -863,7 +863,6 @@ export class Compiler extends DiagnosticEmitter {
if (signature.requiredParameters < signature.parameterTypes.length) {
// utilize varargs stub to fill in omitted arguments
functionInstance = this.ensureVarargsStub(functionInstance);
this.ensureArgumentsLength();
this.runtimeFeatures |= RuntimeFeatures.setArgumentsLength;
}
if (functionInstance.is(CommonFlags.COMPILED)) {
Expand Down Expand Up @@ -6653,11 +6652,13 @@ export class Compiler extends DiagnosticEmitter {
}

/** Makes sure that the arguments length helper global is present. */
ensureArgumentsLength(): void {
ensureArgumentsLength(): string {
var name = BuiltinNames.argumentsLength;
if (!this.builtinArgumentsLength) {
let module = this.module;
this.builtinArgumentsLength = module.addGlobal(BuiltinNames.argumentsLength, NativeType.I32, true, module.i32(0));
this.builtinArgumentsLength = module.addGlobal(name, NativeType.I32, true, module.i32(0));
}
return name;
}

/** Ensures compilation of the varargs stub for the specified function. */
Expand Down Expand Up @@ -6725,17 +6726,18 @@ export class Compiler extends DiagnosticEmitter {
let label = i.toString() + ofN;
names[i] = label;
}
var argumentsLength = this.ensureArgumentsLength();
var table = module.block(names[0], [
module.block("outOfRange", [
module.switch(names, "outOfRange",
// condition is number of provided optional arguments, so subtract required arguments
minArguments
? module.binary(
BinaryOp.SubI32,
module.global_get(BuiltinNames.argumentsLength, NativeType.I32),
module.global_get(argumentsLength, NativeType.I32),
module.i32(minArguments)
)
: module.global_get(BuiltinNames.argumentsLength, NativeType.I32)
: module.global_get(argumentsLength, NativeType.I32)
)
]),
module.unreachable()
Expand Down Expand Up @@ -6912,9 +6914,8 @@ export class Compiler extends DiagnosticEmitter {
let nativeReturnType = overloadSignature.returnType.toNativeType();
let stmts = new Array<ExpressionRef>();
if (needsVarargsStub) {
this.ensureArgumentsLength();
// Safe to prepend since paramExprs are local.get's
stmts.push(module.global_set(BuiltinNames.argumentsLength, module.i32(numParameters)));
stmts.push(module.global_set(this.ensureArgumentsLength(), module.i32(numParameters)));
}
if (returnType == Type.void) {
stmts.push(
Expand Down Expand Up @@ -7123,7 +7124,7 @@ export class Compiler extends DiagnosticEmitter {
assert(!(getSideEffects(lastOperand) & SideEffects.WritesGlobal));
let lastOperandType = parameterTypes[maxArguments - 1];
operands[maxOperands - 1] = module.block(null, [
module.global_set(BuiltinNames.argumentsLength, module.i32(numArguments)),
module.global_set(this.ensureArgumentsLength(), module.i32(numArguments)),
lastOperand
], lastOperandType.toNativeType());
this.operandsTostack(instance.signature, operands);
Expand All @@ -7134,7 +7135,6 @@ export class Compiler extends DiagnosticEmitter {
} else {
this.currentType = returnType;
}
this.ensureArgumentsLength();
return expr;
}
}
Expand Down Expand Up @@ -7226,20 +7226,20 @@ export class Compiler extends DiagnosticEmitter {
// We might be calling a varargs stub here, even if all operands have been
// provided, so we must set `argumentsLength` in any case. Inject setting it
// into the index argument, which becomes executed last after any operands.
this.ensureArgumentsLength();
var argumentsLength = this.ensureArgumentsLength();
var nativeSizeType = this.options.nativeSizeType;
if (getSideEffects(functionArg) & SideEffects.WritesGlobal) {
let flow = this.currentFlow;
let temp = flow.getTempLocal(this.options.usizeType, findUsedLocals(functionArg));
functionArg = module.block(null, [
module.local_set(temp.index, functionArg, true), // Function
module.global_set(BuiltinNames.argumentsLength, module.i32(numArguments)),
module.global_set(argumentsLength, module.i32(numArguments)),
module.local_get(temp.index, nativeSizeType)
], nativeSizeType);
flow.freeTempLocal(temp);
} else { // simplify
functionArg = module.block(null, [
module.global_set(BuiltinNames.argumentsLength, module.i32(numArguments)),
module.global_set(argumentsLength, module.i32(numArguments)),
functionArg
], nativeSizeType);
}
Expand Down