JavaScriptExample
diff --git a/‎lib/wasm/WebAssemblyGenerator.js‎
Lines changed: 20 additions & 43 deletions b/‎lib/wasm/WebAssemblyGenerator.js‎
Lines changed: 20 additions & 43 deletions
@@ -178,6 +178,7 @@ function getNextFuncIndex(ast, countImportedFunc) {
  * @returns {ArrayBufferTransform} transform
  */
 const rewriteImportedGlobals = state => bin => {
+	const additionalInitCode = state.additionalInitCode;
 	const newGlobals = [];
 
 	bin = editWithAST(state.ast, bin, {
@@ -212,29 +213,7 @@ const rewriteImportedGlobals = state => bin => {
 		// in order to preserve non-imported global's order we need to re-inject
 		// those as well
 		Global(path) {
-			newGlobals.push(path.node);
-			path.remove();
-		}
-	});
-
-	// Add global declaration instructions
-	return addWithAST(state.ast, bin, newGlobals);
-};
-
-const rewriteGlobalsReferingImportedGlobals = state => bin => {
-	const additionalInitCode = [];
-
-	// Track global index in the module
-	let globalidx = 0;
-
-	bin = editWithAST(state.ast, bin, {
-		ModuleImport({ node }) {
-			if (isGlobalImport(node) === true) {
-				globalidx++;
-			}
-		},
-
-		Global({ node }) {
+			const { node } = path;
 			const [init] = node.init;
 
 			if (init.id === "get_global") {
@@ -256,28 +235,18 @@ const rewriteGlobalsReferingImportedGlobals = state => bin => {
 					 * same index.
 					 */
 					t.instruction("get_local", [initialGlobalidx]),
-					t.instruction("set_global", [t.indexLiteral(globalidx)])
+					t.instruction("set_global", [t.indexLiteral(newGlobals.length)])
 				);
 			}
 
-			globalidx++;
+			newGlobals.push(node);
+
+			path.remove();
 		}
 	});
 
-	// Update the init with our additional runtime code
-	if (additionalInitCode.length > 0) {
-		bin = editWithAST(state.ast, bin, {
-			Func({ node }) {
-				if (node.name.value === state.initFuncId.value) {
-					const newBody = [...node.body, ...additionalInitCode];
-
-					node.body = newBody;
-				}
-			}
-		});
-	}
-
-	return bin;
+	// Add global declaration instructions
+	return addWithAST(state.ast, bin, newGlobals);
 };
 
 /**
@@ -333,6 +302,7 @@ const rewriteImports = ({ ast, usedDependencyMap }) => bin => {
  * @param {t.Identifier} state.initFuncId identifier of the init function
  * @param {t.IndexLiteral} state.startAtFuncIndex index of the start function
  * @param {t.ModuleImport[]} state.importedGlobals list of imported globals
+ * @param {t.Instruction[]} state.additionalInitCode list of addition instructions for the init function
  * @param {t.IndexLiteral} state.nextFuncIndex index of the next function
  * @param {t.IndexLiteral} state.nextTypeIndex index of the next type
  * @returns {ArrayBufferTransform} transform
@@ -342,6 +312,7 @@ const addInitFunction = ({
 	initFuncId,
 	startAtFuncIndex,
 	importedGlobals,
+	additionalInitCode,
 	nextFuncIndex,
 	nextTypeIndex
 }) => bin => {
@@ -366,6 +337,10 @@ const addInitFunction = ({
 		funcBody.push(t.callInstruction(startAtFuncIndex));
 	}
 
+	for (const instr of additionalInitCode) {
+		funcBody.push(instr);
+	}
+
 	const funcResults = [];
 
 	// Code section
@@ -429,6 +404,9 @@ class WebAssemblyGenerator extends Generator {
 
 		const usedDependencyMap = getUsedDependencyMap(module);
 
+		/** @type {t.Instruction[]} */
+		const additionalInitCode = [];
+
 		const transform = compose(
 			rewriteExportNames({
 				ast,
@@ -437,7 +415,7 @@ class WebAssemblyGenerator extends Generator {
 
 			removeStartFunc({ ast }),
 
-			rewriteImportedGlobals({ ast }),
+			rewriteImportedGlobals({ ast, additionalInitCode }),
 
 			rewriteImports({
 				ast,
@@ -448,12 +426,11 @@ class WebAssemblyGenerator extends Generator {
 				ast,
 				initFuncId,
 				importedGlobals,
+				additionalInitCode,
 				startAtFuncIndex,
 				nextFuncIndex,
 				nextTypeIndex
-			}),
-
-			rewriteGlobalsReferingImportedGlobals({ ast, initFuncId })
+			})
 		);
 
 		const newBin = transform(bin);