refactory

src/builtins.ts

@@ -10198,7 +10198,6 @@ export function compileVisitGlobals(compiler: Compiler): void {
     TypeRef.I32,  // cookie
     TypeRef.None, // => void
     [ sizeTypeRef ],
-    null,
     exprs.length
       ? module.block(null, exprs)
       : module.nop()
@@ -10305,7 +10304,6 @@ function ensureVisitMembersOf(compiler: Compiler, instance: Class): void {
     createType([sizeTypeRef, TypeRef.I32]),
     TypeRef.None,
     needsTempValue ? [ sizeTypeRef ] : null,
-    null,
     module.flatten(body, TypeRef.None)
   );
 
@@ -10388,7 +10386,6 @@ export function compileVisitMembers(compiler: Compiler): void {
     createType([ sizeTypeRef, TypeRef.I32 ]), // this, cookie
     TypeRef.None, // => void
     null,
-    null,
     module.flatten([
       current,
       module.unreachable()
@@ -10525,7 +10522,6 @@ export function compileClassInstanceOf(compiler: Compiler, prototype: ClassProto
     sizeTypeRef,
     TypeRef.I32,
     null,
-    null,
     module.flatten(stmts)
   );
 }

src/compiler.ts

@@ -749,7 +749,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, TypeRef.I32, TypeRef.None, null, null,
+      module.addFunction(BuiltinNames.setArgumentsLength, TypeRef.I32, TypeRef.None, null,
         module.global_set(this.ensureArgumentsLength(), module.local_get(0, TypeRef.I32))
       );
       module.addFunctionExport(BuiltinNames.setArgumentsLength, ExportNames.setArgumentsLength);
@@ -784,9 +784,9 @@ export class Compiler extends DiagnosticEmitter {
         signature.paramRefs,
         signature.resultRefs,
         typesToRefs(startFunctionInstance.additionalLocals),
-        startFunctionInstance.localsByIndex.map<string>(local => local.name),
         module.flatten(startFunctionBody)
       );
+      module.setLocalNames(funcRef, startFunctionInstance.localsByIndex.map<string>(local => local.name));
       startFunctionInstance.finalize(module, funcRef);
       if (exportStart == null) module.setStart(funcRef);
       else {
@@ -1020,14 +1020,14 @@ export class Compiler extends DiagnosticEmitter {
       let numLocals = locals.length;
       let varTypes = new Array<TypeRef>(numLocals);
       for (let i = 0; i < numLocals; ++i) varTypes[i] = locals[i].type.toRef();
-      module.addFunction(
+      const funcRef = module.addFunction(
         startFunction.internalName,
         startSignature.paramRefs,
         startSignature.resultRefs,
         varTypes,
-        startFunction.localsByIndex.map<string>(locals => locals.name),
         module.flatten(startFunctionBody)
       );
+      module.setLocalNames(funcRef, startFunction.localsByIndex.map<string>(local => local.name));
       previousBody.push(
         module.call(startFunction.internalName, null, TypeRef.None)
       );
@@ -1477,9 +1477,9 @@ export class Compiler extends DiagnosticEmitter {
         signature.paramRefs,
         signature.resultRefs,
         typesToRefs(instance.additionalLocals),
-        instance.localsByIndex.map<string>(local => local.name),
         module.flatten(stmts, instance.signature.returnType.toRef())
       );
+      module.setLocalNames(funcRef, instance.localsByIndex.map<string>(local => local.name));
 
     // imported function
     } else if (instance.is(CommonFlags.AMBIENT)) {
@@ -1518,7 +1518,6 @@ export class Compiler extends DiagnosticEmitter {
         signature.paramRefs,
         signature.resultRefs,
         null,
-        null,
         module.unreachable()
       );
     } else {
@@ -1684,7 +1683,7 @@ export class Compiler extends DiagnosticEmitter {
     var valueTypeRef = valueType.toRef();
     var thisTypeRef = this.options.sizeTypeRef;
     // return this.field
-    instance.getterRef = module.addFunction(instance.internalGetterName, thisTypeRef, valueTypeRef, null, null,
+    instance.getterRef = module.addFunction(instance.internalGetterName, thisTypeRef, valueTypeRef, null,
       module.load(valueType.byteSize, valueType.isSignedIntegerValue,
         module.local_get(0, thisTypeRef),
         valueTypeRef, instance.memoryOffset
@@ -1728,12 +1727,7 @@ export class Compiler extends DiagnosticEmitter {
         ], TypeRef.None);
       }
     }
-    instance.setterRef = module.addFunction(
-      instance.internalSetterName,
-      createType([ thisTypeRef, valueTypeRef ]),
-      TypeRef.None,
-      null,
-      null,
+    instance.setterRef = module.addFunction(instance.internalSetterName, createType([ thisTypeRef, valueTypeRef ]), TypeRef.None, null,
       bodyExpr
     );
     if (instance.getterRef) {
@@ -6574,7 +6568,6 @@ export class Compiler extends DiagnosticEmitter {
       stub.signature.paramRefs,
       stub.signature.resultRefs,
       typesToRefs(stub.additionalLocals),
-      null,
       module.flatten(stmts, returnType.toRef())
     );
     stub.set(CommonFlags.COMPILED);
@@ -6599,7 +6592,6 @@ export class Compiler extends DiagnosticEmitter {
       stub.signature.paramRefs,
       stub.signature.resultRefs,
       null,
-      null,
       module.unreachable()
     );
     this.virtualStubs.add(original);
@@ -6724,7 +6716,6 @@ export class Compiler extends DiagnosticEmitter {
       stub.signature.paramRefs,
       stub.signature.resultRefs,
       [ TypeRef.I32 ],
-      null, 
       module.block(null, [
         builder.render(tempIndex),
         body
@@ -8622,9 +8613,9 @@ export class Compiler extends DiagnosticEmitter {
         signature.paramRefs,
         signature.resultRefs,
         varTypes,
-        instance.localsByIndex.map<string>(local => local.name),
         module.flatten(stmts, sizeTypeRef)
       );
+      module.setLocalNames(funcRef, instance.localsByIndex.map<string>(local => local.name));
       instance.finalize(module, funcRef);
     }
 

src/module.ts

@@ -1896,7 +1896,6 @@ export class Module {
     params: TypeRef,
     results: TypeRef,
     varTypes: TypeRef[] | null,
-    localNames: string[] | null,
     body: ExpressionRef
   ): FunctionRef {
     var cStr = this.allocStringCached(name);
@@ -1911,7 +1910,6 @@ export class Module {
       body
     );
     binaryen._free(cArr);
-    this.setLocalNames(ret, localNames);
     return ret;
   }
 

src/passes/ministack.ts

@@ -144,7 +144,7 @@ export class MiniStack extends Pass {
           module.local_get(numParams, results)
         );
       }
-      module.addFunction(wrapperName, params, results, vars, null,
+      module.addFunction(wrapperName, params, results, vars,
         module.block(null, stmts, results)
       );
     }

src/passes/shadowstack.ts

@@ -317,7 +317,7 @@ export class ShadowStackPass extends Pass {
     var module = this.module;
     if (!this.hasStackCheckFunction) {
       this.hasStackCheckFunction = true;
-      module.addFunction("~stack_check", TypeRef.None, TypeRef.None, null, null,
+      module.addFunction("~stack_check", TypeRef.None, TypeRef.None, null,
         module.if(
           module.binary(BinaryOp.LtI32,
             module.global_get(BuiltinNames.stack_pointer, this.ptrType),