feat(compiler)!: Deduplicate imports

compiler/src/codegen/compcore.re

@@ -3499,10 +3499,7 @@ let compile_wasm_module =
 
   validate_module(~name?, wasm_mod);
 
-  switch (Config.profile^) {
-  | Some(Release) => Optimize_mod.optimize(wasm_mod)
-  | None => ()
-  };
+  Optimize_mod.optimize(wasm_mod);
   wasm_mod;
 };
 

compiler/src/codegen/optimize_mod.re

@@ -227,25 +227,29 @@ let optimize =
       ~shrink_level=default_shrink_level,
       wasm_mod,
     ) => {
+  let passes =
+    switch (Config.profile^) {
+    | Some(Release) =>
+      List.concat([
+        default_global_optimization_pre_passes(
+          ~optimize_level,
+          ~shrink_level,
+          wasm_mod,
+        ),
+        default_function_optimization_passes(
+          ~optimize_level,
+          ~shrink_level,
+          wasm_mod,
+        ),
+        default_global_optimization_post_passes(
+          ~optimize_level,
+          ~shrink_level,
+          wasm_mod,
+        ),
+      ])
+    | None => [Passes.duplicate_import_elimination]
+    };
   // Translation of https://github.com/WebAssembly/binaryen/blob/version_107/src/passes/pass.cpp#L441-L445
-  let default_optimizations_passes =
-    List.concat([
-      default_global_optimization_pre_passes(
-        ~optimize_level,
-        ~shrink_level,
-        wasm_mod,
-      ),
-      default_function_optimization_passes(
-        ~optimize_level,
-        ~shrink_level,
-        wasm_mod,
-      ),
-      default_global_optimization_post_passes(
-        ~optimize_level,
-        ~shrink_level,
-        wasm_mod,
-      ),
-    ]);
 
-  Module.run_passes(wasm_mod, default_optimizations_passes);
+  Module.run_passes(wasm_mod, passes);
 };

compiler/test/suites/includes.re

@@ -207,4 +207,38 @@ describe("includes", ({test, testSkip}) => {
     "from \"reprovideContents\" include ReprovideContents; use ReprovideContents.{ type OtherT as Other }; print({ x: 1 }: Other)",
     "{\n  x: 1\n}\n",
   );
+  /* Duplicate imports */
+  test("dedupe_includes", ({expect}) => {
+    let name = "dedupe_includes";
+    let outfile = wasmfile(name);
+    ignore @@
+    compile(
+      ~hook=Grain.Compile.stop_after_assembled,
+      name,
+      {|
+      module DeDupeIncludes
+      // Ensures fd_write is only included once
+      print("test")
+      |},
+    );
+    let ic = open_in_bin(outfile);
+    let sections = Grain_utils.Wasm_utils.get_wasm_sections(ic);
+    close_in(ic);
+    let import_section =
+      List.find_map(
+        (sec: Grain_utils.Wasm_utils.wasm_bin_section) =>
+          switch (sec) {
+          | {sec_type: Import(imports)} => Some(imports)
+          | _ => None
+          },
+        sections,
+      );
+    expect.option(import_section).toBeSome();
+    expect.int(List.length(Option.get(import_section))).toBe(1);
+    expect.list(Option.get(import_section)).toContainEqual((
+      WasmFunction,
+      "wasi_snapshot_preview1",
+      "fd_write",
+    ));
+  });
 });