create correct init for float types

sokra · sokra · commit 1e4b1c72125e · 2018-06-02T17:57:58.000+02:00
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
@@ -166,6 +166,27 @@ function getNextFuncIndex(ast, countImportedFunc) {
 	return t.indexLiteral(vectorOfSize + countImportedFunc);
 }
 
+/**
+ * Create a init instruction for a global
+ * @param {t.GlobalType} globalType the global type
+ * @returns {t.Instruction} init expression
+ */
+const createDefaultInitForGlobal = globalType => {
+	if (globalType.valtype[0] === "i") {
+		// create NumberLiteral global initializer
+		return t.objectInstruction("const", globalType.valtype, [
+			t.numberLiteralFromRaw(66)
+		]);
+	} else if (globalType.valtype[0] === "f") {
+		// create FloatLiteral global initializer
+		return t.objectInstruction("const", globalType.valtype, [
+			t.floatLiteral(66, false, false, "66")
+		]);
+	} else {
+		throw new Error("unknown type: " + globalType.valtype);
+	}
+};
+
 /**
  * Rewrite the import globals:
  * - removes the ModuleImport instruction
@@ -190,21 +211,7 @@ const rewriteImportedGlobals = state => bin => {
 
 				globalType.mutability = "var";
 
-				let init;
-
-				if (globalType.valtype[0] === "i") {
-					// create NumberLiteral global initializer
-					init = t.objectInstruction("const", globalType.valtype, [
-						t.numberLiteralFromRaw(0)
-					]);
-				} else if (globalType.valtype[0] === "f") {
-					// create FloatLiteral global initializer
-					init = t.objectInstruction("const", globalType.valtype, [
-						t.floatLiteral(0, false, false, "0")
-					]);
-				} else {
-					throw new Error("unknown type: " + globalType.valtype);
-				}
+				const init = createDefaultInitForGlobal(globalType);
 
 				newGlobals.push(t.global(globalType, [init]));
 
@@ -223,12 +230,7 @@ const rewriteImportedGlobals = state => bin => {
 
 				const initialGlobalidx = init.args[0];
 
-				const valtype = node.globalType.valtype;
-
-				node.init = [
-					// Poisong globals, they are meant to be rewritten
-					t.objectInstruction("const", valtype, [t.numberLiteralFromRaw(0)])
-				];
+				node.init = [createDefaultInitForGlobal(node.globalType)];
 
 				additionalInitCode.push(
 					/**
diff --git a/test/cases/wasm/export-imported-global/env.js b/test/cases/wasm/export-imported-global/env.js
@@ -1 +1,2 @@
 export const n = 1;
+export const m = 1.25
diff --git a/test/cases/wasm/export-imported-global/index.js b/test/cases/wasm/export-imported-global/index.js
@@ -1,6 +1,8 @@
 it("should export imported global", function() {
-	return import("./module").then(function({ v, w }) {
+	return import("./module").then(function({ v, w, x, test }) {
 		expect(v).toBe(1);
 		expect(w).toBe(1);
+		expect(x).toBe(1.25);
+		expect(test()).toBe(2);
 	});
 });
diff --git a/test/cases/wasm/export-imported-global/module.wat b/test/cases/wasm/export-imported-global/module.wat
@@ -1,6 +1,17 @@
 (module
   (import "./env.js" "n" (global i32))
+  (import "./env.js" "m" (global $g2 f64))
   (export "v" (global 0))
   (global $g i32 (get_global 0))
   (export "w" (global $g))
+  (export "x" (global $g2))
+	(func (export "test") (result i32)
+		get_global $g2
+		get_global $g2
+		f64.add
+		drop
+		get_global 0
+		get_global $g
+		i32.add
+	)
 )

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`export const n = 1;`
	`2`	`+export const m = 1.25`