fixes after rebase

Author: ospencer

compiler/src/codegen/compcore.re

@@ -3404,7 +3404,8 @@ exception WasmRunnerError(Module.t, option(string), string);
 let validate_module = (~name=?, wasm_mod: Module.t) =>
   try(assert(Module.validate(wasm_mod) == 1)) {
   | Assert_failure(_) =>
-    raise(WasmRunnerError(wasm_mod, name, "WARNING: Invalid module"))
+    Module.print(wasm_mod);
+    raise(WasmRunnerError(wasm_mod, name, "WARNING: Invalid module"));
   };
 
 let compile_wasm_module =
@@ -3458,10 +3459,9 @@ let compile_wasm_module =
 
   let compile_one = (dep_id, prog: mash_code) => {
     let env = {...env, dep_id, compilation_mode: prog.compilation_mode};
+    ignore @@ compile_imports(wasm_mod, env, prog, import_map);
     ignore @@ compile_globals(wasm_mod, env, prog);
     ignore @@ compile_functions(wasm_mod, env, prog);
-    ignore @@ compile_exports(wasm_mod, env, prog);
-    ignore @@ compile_imports(wasm_mod, env, prog, import_map);
     ignore @@ compile_tables(wasm_mod, env, prog);
   };
 

compiler/test/__snapshots__/modules.b59b0085.0.snapshot

@@ -14,11 +14,11 @@ modules › reprovided_module
       (mimp_kind MImportGrain) (mimp_setup MCallGetter) (mimp_used true))))
    (exports
     ((WasmFunctionExport (ex_function_name Simple.Simple.func)
-      (ex_function_internal_name func_1125))
+      (ex_function_internal_name func_1049))
      (WasmGlobalExport (ex_global_name Simple.Simple.func)
-      (ex_global_internal_name func_1125))
+      (ex_global_internal_name func_1049))
      (WasmGlobalExport (ex_global_name Simple.Simple.foo)
-      (ex_global_internal_name foo_1126))))
+      (ex_global_internal_name foo_1050))))
    (main_body
     (((instr_desc
        (MImmediate

compiler/test/__snapshots__/provides.30cbc409.0.snapshot

@@ -17,34 +17,39 @@ describe("provides", ({test, testSkip}) => {
     test(
       name,
       ({expect}) => {
-        let state =
+        ignore(
           compile(
-            ~hook=Grain.Compile.stop_after_compiled,
+            ~link=true,
             ~config_fn=
               () => {
                 Grain_utils.Config.use_start_section := use_start_section
               },
             name,
             prog,
-          );
-        ();
-        switch (state.Grain.Compile.cstate_desc) {
-        | Compiled({asm}) =>
-          let num_exports = Binaryen.Export.get_num_exports(asm);
-          let exports =
-            List.init(
-              num_exports,
-              i => {
-                let export = Binaryen.Export.get_export_by_index(asm, i);
-                (
-                  Binaryen.Export.get_name(export),
-                  Binaryen.Export.export_get_kind(export),
-                );
-              },
-            );
-          List.iter(expect.list(exports).toContainEqual, expectedExports);
-        | _ => assert(false)
+          ),
+        );
+        let bytes = {
+          let ic = open_in_bin(wasmfile(name));
+          let chan_len = in_channel_length(ic);
+          let bytes = Bytes.create(chan_len);
+          really_input(ic, bytes, 0, chan_len);
+          close_in(ic);
+          bytes;
         };
+        let asm = Binaryen.Module.read(bytes);
+        let num_exports = Binaryen.Export.get_num_exports(asm);
+        let exports =
+          List.init(
+            num_exports,
+            i => {
+              let export = Binaryen.Export.get_export_by_index(asm, i);
+              (
+                Binaryen.Export.get_name(export),
+                Binaryen.Export.export_get_kind(export),
+              );
+            },
+          );
+        List.iter(expect.list(exports).toContainEqual, expectedExports);
       },
     );
   };