fix(wasm): preserve global ordering

xtuc · xtuc · commit 23795ba666ae · 2018-05-29T14:52:29.000+02:00
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
@@ -207,6 +207,13 @@ const rewriteImportedGlobals = state => bin => {
 
 				path.remove();
 			}
+		},
+
+		// 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();
 		}
 	});
 
diff --git a/test/cases/wasm/imported-global-preserve-ordering/env.js b/test/cases/wasm/imported-global-preserve-ordering/env.js
@@ -0,0 +1,2 @@
+export const a = 1;
+export const b = 2;
diff --git a/test/cases/wasm/imported-global-preserve-ordering/index.js b/test/cases/wasm/imported-global-preserve-ordering/index.js
@@ -0,0 +1,6 @@
+it("should preserve the ordering of globals", function() {
+	return import("./module.wat").then(function(e) {
+		expect(e.c).toBe(3);
+		expect(e.d).toBe(4);
+	});
+});
diff --git a/test/cases/wasm/imported-global-preserve-ordering/module.wat b/test/cases/wasm/imported-global-preserve-ordering/module.wat
@@ -0,0 +1,10 @@
+(module
+  (import "./env.js" "a" (global i32))
+  (import "./env.js" "b" (global i32))
+
+  (global $c i32 (i32.const 3))
+  (global $d i32 (i32.const 4))
+
+  (export "c" (global $c))
+  (export "d" (global $d))
+)
diff --git a/test/cases/wasm/imported-global-preserve-ordering/test.filter.js b/test/cases/wasm/imported-global-preserve-ordering/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function(config) {
+	return supportsWebAssembly();
+};

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,13 @@ const rewriteImportedGlobals = state => bin => {`
`207`	`207`
`208`	`208`	`path.remove();`
`209`	`209`	`}`
	`210`	`+ },`
	`211`	`+`
	`212`	`+ // in order to preserve non-imported global's order we need to re-inject`
	`213`	`+ // those as well`
	`214`	`+ Global(path) {`
	`215`	`+ newGlobals.push(path.node);`
	`216`	`+ path.remove();`
`210`	`217`	`}`
`211`	`218`	`});`
`212`	`219`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export const a = 1;`
	`2`	`+export const b = 2;`