Fix global redeclaration and update ExpressionId enum

Prevents duplicate global declarations in builtins by checking for existing globals before adding. Defers visit function compilation until after custom passes in the compiler. Updates the ExpressionId enum in module.ts to match new Binaryen IDs. Also updates build-web.js to support lockfileVersion 3 dependency resolution.

Author: BlobMaster41

package-lock.json

@@ -8,8 +8,9 @@ export function buildWeb() {
   const pkg = JSON.parse(fs.readFileSync(join(__dirname, "../package-lock.json")));
 
   const mainVersion = pkg.version;
-  const binaryenVersion = pkg.dependencies.binaryen.version;
-  const longVersion = pkg.dependencies.long.version;
+  // lockfileVersion 3 stores deps in packages["node_modules/..."]
+  const binaryenVersion = pkg.packages["node_modules/binaryen"].version;
+  const longVersion = pkg.packages["node_modules/long"].version;
 
   const distUrl = mainVersion === "0.0.0" ? `./` : `https://cdn.jsdelivr.net/npm/assemblyscript@${mainVersion}/dist/`;
   const binaryenUrl = `https://cdn.jsdelivr.net/npm/binaryen@${binaryenVersion}/index.js`;

scripts/build-web.js

@@ -2334,7 +2334,10 @@ function builtin_heap_base_compile(ctx: BuiltinVariableContext): void {
   let element = ctx.element;
   let type = element.type;
   compiler.runtimeFeatures |= RuntimeFeatures.Heap;
-  module.addGlobal(element.internalName, type.toRef(), true, compiler.makeZero(type)); // dummy
+  // Only add the dummy global if it doesn't already exist (may be called multiple times due to recompilation)
+  if (!module.getGlobal(element.internalName)) {
+    module.addGlobal(element.internalName, type.toRef(), true, compiler.makeZero(type)); // dummy
+  }
 }
 builtinVariables_onCompile.set(BuiltinNames.heap_base, builtin_heap_base_compile);
 
@@ -2357,7 +2360,10 @@ function builtin_data_end_compile(ctx: BuiltinVariableContext): void {
   let element = ctx.element;
   let type = element.type;
   compiler.runtimeFeatures |= RuntimeFeatures.Data;
-  module.addGlobal(element.internalName, type.toRef(), true, compiler.makeZero(type)); // dummy
+  // Only add the dummy global if it doesn't already exist (may be called multiple times due to recompilation)
+  if (!module.getGlobal(element.internalName)) {
+    module.addGlobal(element.internalName, type.toRef(), true, compiler.makeZero(type)); // dummy
+  }
 }
 builtinVariables_onCompile.set(BuiltinNames.data_end, builtin_data_end_compile);
 
@@ -2380,7 +2386,10 @@ function builtin_stack_pointer_compile(ctx: BuiltinVariableContext): void {
   let element = ctx.element;
   let type = element.type;
   compiler.runtimeFeatures |= RuntimeFeatures.Stack;
-  module.addGlobal(element.internalName, type.toRef(), true, compiler.makeZero(type)); // dummy
+  // Only add the dummy global if it doesn't already exist (may be called multiple times due to recompilation)
+  if (!module.getGlobal(element.internalName)) {
+    module.addGlobal(element.internalName, type.toRef(), true, compiler.makeZero(type)); // dummy
+  }
 }
 builtinVariables_onCompile.set(BuiltinNames.stack_pointer, builtin_stack_pointer_compile);
 
@@ -2403,7 +2412,10 @@ function builtin_rtti_base_compile(ctx: BuiltinVariableContext): void {
   let element = ctx.element;
   let type = element.type;
   compiler.runtimeFeatures |= RuntimeFeatures.Rtti;
-  module.addGlobal(element.internalName, type.toRef(), true, compiler.makeZero(type)); // dummy
+  // Only add the dummy global if it doesn't already exist (may be called multiple times due to recompilation)
+  if (!module.getGlobal(element.internalName)) {
+    module.addGlobal(element.internalName, type.toRef(), true, compiler.makeZero(type)); // dummy
+  }
 }
 builtinVariables_onCompile.set(BuiltinNames.rtti_base, builtin_rtti_base_compile);
 

src/builtins.ts

@@ -651,11 +651,11 @@ export class Compiler extends DiagnosticEmitter {
       }
     }
 
-    // finalize runtime features
+    // finalize runtime features (RTTI must be compiled here as it affects memory layout)
     module.removeGlobal(BuiltinNames.rtti_base);
     if (this.runtimeFeatures & RuntimeFeatures.Rtti) compileRTTI(this);
-    if (this.runtimeFeatures & RuntimeFeatures.visitGlobals) compileVisitGlobals(this);
-    if (this.runtimeFeatures & RuntimeFeatures.visitMembers) compileVisitMembers(this);
+    // NOTE: compileVisitGlobals and compileVisitMembers are deferred until after
+    // custom passes (like shadow stack) that may trigger additional compilations
 
     let memoryOffset = i64_align(this.memoryOffset, options.usizeType.byteSize);
 
@@ -765,6 +765,10 @@ export class Compiler extends DiagnosticEmitter {
       new RtraceMemory(this).walkModule();
     }
 
+    // Finalize visit functions after custom passes that may trigger additional compilations
+    if (this.runtimeFeatures & RuntimeFeatures.visitGlobals) compileVisitGlobals(this);
+    if (this.runtimeFeatures & RuntimeFeatures.visitMembers) compileVisitMembers(this);
+
     return module;
   }
 

src/compiler.ts

@@ -251,74 +251,60 @@ export const enum ExpressionId {
   AtomicWait = 26 /* _BinaryenAtomicWaitId */,
   AtomicNotify = 27 /* _BinaryenAtomicNotifyId */,
   AtomicFence = 28 /* _BinaryenAtomicFenceId */,
-  SIMDExtract = 29 /* _BinaryenSIMDExtractId */,
-  SIMDReplace = 30 /* _BinaryenSIMDReplaceId */,
-  SIMDShuffle = 31 /* _BinaryenSIMDShuffleId */,
-  SIMDTernary = 32 /* _BinaryenSIMDTernaryId */,
-  SIMDShift = 33 /* _BinaryenSIMDShiftId */,
-  SIMDLoad = 34 /* _BinaryenSIMDLoadId */,
-  SIMDLoadStoreLane = 35 /* _BinaryenSIMDLoadStoreLaneId */,
-  MemoryInit = 36 /* _BinaryenMemoryInitId */,
-  DataDrop = 37 /* _BinaryenDataDropId */,
-  MemoryCopy = 38 /* _BinaryenMemoryCopyId */,
-  MemoryFill = 39 /* _BinaryenMemoryFillId */,
-  Pop = 40 /* _BinaryenPopId */,
-  RefNull = 41 /* _BinaryenRefNullId */,
-  RefIsNull = 42 /* _BinaryenRefIsNullId */,
-  RefFunc = 43 /* _BinaryenRefFuncId */,
-  RefEq = 44 /* _BinaryenRefEqId */,
-  TableGet = 45 /* _BinaryenTableGetId */,
-  TableSet = 46 /* _BinaryenTableSetId */,
-  TableSize = 47 /* _BinaryenTableSizeId */,
-  TableGrow = 48 /* _BinaryenTableGrowId */,
-  TableFill = 49 /* _BinaryenTableFillId */,
-  TableCopy = 50 /* _BinaryenTableCopyId */,
-  TableInit = 51 /* _BinaryenTableInitId */,
-  Try = 52 /* _BinaryenTryId */,
-  TryTable = 53 /* _BinaryenTryTableId */,
-  Throw = 54 /* _BinaryenThrowId */,
-  Rethrow = 55 /* _BinaryenRethrowId */,
-  ThrowRef = 56 /* _BinaryenThrowRefId */,
-  TupleMake = 57 /* _BinaryenTupleMakeId */,
-  TupleExtract = 58 /* _BinaryenTupleExtractId */,
-  RefI31 = 59 /* _BinaryenRefI31Id */,
-  I31Get = 60 /* _BinaryenI31GetId */,
-  CallRef = 61 /* _BinaryenCallRefId */,
-  RefTest = 62 /* _BinaryenRefTestId */,
-  RefCast = 63 /* _BinaryenRefCastId */,
-  RefGetDesc = 64 /* _BinaryenRefGetDescId */,
-  BrOn = 65 /* _BinaryenBrOnId */,
-  StructNew = 66 /* _BinaryenStructNewId */,
-  StructGet = 67 /* _BinaryenStructGetId */,
-  StructSet = 68 /* _BinaryenStructSetId */,
-  StructRMW = 69 /* _BinaryenStructRMWId */,
-  StructCmpxchg = 70 /* _BinaryenStructCmpxchgId */,
-  ArrayNew = 71 /* _BinaryenArrayNewId */,
-  ArrayNewData = 72 /* _BinaryenArrayNewDataId */,
-  ArrayNewElem = 73 /* _BinaryenArrayNewElemId */,
-  ArrayNewFixed = 74 /* _BinaryenArrayNewFixedId */,
-  ArrayGet = 75 /* _BinaryenArrayGetId */,
-  ArraySet = 76 /* _BinaryenArraySetId */,
-  ArrayLen = 77 /* _BinaryenArrayLenId */,
-  ArrayCopy = 78 /* _BinaryenArrayCopyId */,
-  ArrayFill = 79 /* _BinaryenArrayFillId */,
-  ArrayInitData = 80 /* _BinaryenArrayInitDataId */,
-  ArrayInitElem = 81 /* _BinaryenArrayInitElemId */,
-  RefAs = 82 /* _BinaryenRefAsId */,
-  StringNew = 83 /* _BinaryenStringNewId */,
-  StringConst = 84 /* _BinaryenStringConstId */,
-  StringMeasure = 85 /* _BinaryenStringMeasureId */,
-  StringEncode = 86 /* _BinaryenStringEncodeId */,
-  StringConcat = 87 /* _BinaryenStringConcatId */,
-  StringEq = 88 /* _BinaryenStringEqId */,
-  StringWTF16Get = 89 /* _BinaryenStringWTF16GetId */,
-  StringSliceWTF = 90 /* _BinaryenStringSliceWTFId */,
-  ContNew = 91 /* _BinaryenContNewId */,
-  ContBind = 92 /* _BinaryenContBindId */,
-  Suspend = 93 /* _BinaryenSuspendId */,
-  Resume = 94 /* _BinaryenResumeId */,
-  ResumeThrow = 95 /* _BinaryenResumeThrowId */,
-  StackSwitch = 96 /* _BinaryenStackSwitchId */
+  SIMDExtract = 30 /* _BinaryenSIMDExtractId */,
+  SIMDReplace = 31 /* _BinaryenSIMDReplaceId */,
+  SIMDShuffle = 32 /* _BinaryenSIMDShuffleId */,
+  SIMDTernary = 33 /* _BinaryenSIMDTernaryId */,
+  SIMDShift = 34 /* _BinaryenSIMDShiftId */,
+  SIMDLoad = 35 /* _BinaryenSIMDLoadId */,
+  SIMDLoadStoreLane = 36 /* _BinaryenSIMDLoadStoreLaneId */,
+  MemoryInit = 37 /* _BinaryenMemoryInitId */,
+  DataDrop = 38 /* _BinaryenDataDropId */,
+  MemoryCopy = 39 /* _BinaryenMemoryCopyId */,
+  MemoryFill = 40 /* _BinaryenMemoryFillId */,
+  Pop = 41 /* _BinaryenPopId */,
+  RefNull = 42 /* _BinaryenRefNullId */,
+  RefIsNull = 43 /* _BinaryenRefIsNullId */,
+  RefFunc = 44 /* _BinaryenRefFuncId */,
+  RefEq = 45 /* _BinaryenRefEqId */,
+  TableGet = 46 /* _BinaryenTableGetId */,
+  TableSet = 47 /* _BinaryenTableSetId */,
+  TableSize = 48 /* _BinaryenTableSizeId */,
+  TableGrow = 49 /* _BinaryenTableGrowId */,
+  Try = 54 /* _BinaryenTryId */,
+  Throw = 56 /* _BinaryenThrowId */,
+  Rethrow = 57 /* _BinaryenRethrowId */,
+  TupleMake = 59 /* _BinaryenTupleMakeId */,
+  TupleExtract = 60 /* _BinaryenTupleExtractId */,
+  RefI31 = 61 /* _BinaryenRefI31Id */,
+  I31Get = 62 /* _BinaryenI31GetId */,
+  CallRef = 63 /* _BinaryenCallRefId */,
+  RefTest = 64 /* _BinaryenRefTestId */,
+  RefCast = 65 /* _BinaryenRefCastId */,
+  BrOn = 67 /* _BinaryenBrOnId */,
+  StructNew = 68 /* _BinaryenStructNewId */,
+  StructGet = 69 /* _BinaryenStructGetId */,
+  StructSet = 70 /* _BinaryenStructSetId */,
+  ArrayNew = 73 /* _BinaryenArrayNewId */,
+  ArrayNewData = 74 /* _BinaryenArrayNewDataId */,
+  ArrayNewElem = 75 /* _BinaryenArrayNewElemId */,
+  ArrayNewFixed = 76 /* _BinaryenArrayNewFixedId */,
+  ArrayGet = 77 /* _BinaryenArrayGetId */,
+  ArraySet = 78 /* _BinaryenArraySetId */,
+  ArrayLen = 79 /* _BinaryenArrayLenId */,
+  ArrayCopy = 80 /* _BinaryenArrayCopyId */,
+  ArrayFill = 81 /* _BinaryenArrayFillId */,
+  ArrayInitData = 82 /* _BinaryenArrayInitDataId */,
+  ArrayInitElem = 83 /* _BinaryenArrayInitElemId */,
+  RefAs = 86 /* _BinaryenRefAsId */,
+  StringNew = 87 /* _BinaryenStringNewId */,
+  StringConst = 88 /* _BinaryenStringConstId */,
+  StringMeasure = 89 /* _BinaryenStringMeasureId */,
+  StringEncode = 90 /* _BinaryenStringEncodeId */,
+  StringConcat = 91 /* _BinaryenStringConcatId */,
+  StringEq = 92 /* _BinaryenStringEqId */,
+  StringWTF16Get = 94 /* _BinaryenStringWTF16GetId */,
+  StringSliceWTF = 95 /* _BinaryenStringSliceWTFId */
 }
 
 /** Binaryen external kind constants. */