feat: store wasm ast on the module

xtuc · xtuc · commit d72f7c6b1caa · 2018-05-09T17:47:05.000+02:00
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
@@ -8,7 +8,6 @@ const Generator = require("../Generator");
 const { RawSource } = require("webpack-sources");
 
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
-const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
 
 function compose(...fns) {
@@ -244,15 +243,9 @@ const addInitFunction = ({
 
 class WebAssemblyGenerator extends Generator {
 	generate(module) {
+		const ast = module._ast;
 		const bin = module.originalSource().source();
 
-		// FIXME(sven): this module is parsed twice, we could preserve the AST
-		// from wasm/WebAssemblyParser.js
-		const ast = decode(bin, {
-			ignoreDataSection: true,
-			ignoreCodeSection: true
-		});
-
 		const importedGlobals = getImportedGlobals(ast);
 		const countImportedFunc = getCountImportedFunc(ast);
 		const startAtFuncIndex = getStartFuncIndex(ast);
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
@@ -73,6 +73,8 @@ class WebAssemblyParser extends Tapable {
 			}
 		});
 
+		state.module._ast = ast;
+
 		return state;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ class WebAssemblyParser extends Tapable {`
`73`	`73`	`}`
`74`	`74`	`});`
`75`	`75`
	`76`	`+ state.module._ast = ast;`
	`77`	`+`
`76`	`78`	`return state;`
`77`	`79`	`}`
`78`	`80`	`}`