Fixes

ocaml-wasm · Sep 20, 2024 · 91d8286 · 91d8286
1 parent 785564b
commit 91d8286
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/compiler/lib/eval.ml b/compiler/lib/eval.ml
@@ -272,6 +272,10 @@ let constant_js_equal a b =
   | _, Float_array _
   | Int64 _, _
   | _, Int64 _
+  | Int32 _, _
+  | _, Int32 _
+  | NativeInt _, _
+  | _, NativeInt _
   | Tuple _, _
   | _, Tuple _ -> None
 

diff --git a/compiler/lib/flow.ml b/compiler/lib/flow.ml
@@ -341,6 +341,10 @@ let constant_identical a b =
   | _, Float_array _
   | Int64 _, _
   | _, Int64 _
+  | Int32 _, _
+  | _, Int32 _
+  | NativeInt _, _
+  | _, NativeInt _
   | Tuple _, _
   | _, Tuple _ -> false
 

diff --git a/compiler/tests-compiler/dune.inc b/compiler/tests-compiler/dune.inc
@@ -362,11 +362,11 @@
 (library
  ;; compiler/tests-compiler/gh1659.ml
  (name gh1659_15)
- (enabled_if true)
+ (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
  (modules gh1659)
  (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
  (inline_tests
-  (enabled_if true)
+  (enabled_if (and (<> %{profile} wasm) (<> %{profile} wasm-effects)))
   (deps
    (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
    (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))