Merge pull request #4991 from rescript-lang/fix_4990

fix #4990

Author: bobzhang

jscomp/core/lam.ml

@@ -795,7 +795,7 @@ let if_ (a : t) (b : t) (c : t) : t =
          | Lprim(
             {primitive = Pnot ; args = [Lprim{primitive = Pintcomp Ceq ; args = [Lvar j; Lconst _] as args; loc}]})
            when Ident.same i j && eq_approx true_ c
-           -> Lprim{primitive = Pintcomp Ceq; args; loc}
+           -> Lprim{primitive = Pintcomp Cneq; args; loc}
          | _ -> Lifthenelse(a,b,c)
          end 
        | _ ->  Lifthenelse (a,b,c))

jscomp/test/build.ninja

@@ -321,7 +321,8 @@ o test/gpr_4494_test.cmi test/gpr_4494_test.cmj : cc test/gpr_4494_test.ml | $st
 o test/gpr_4519_test.cmi test/gpr_4519_test.cmj : cc test/gpr_4519_test.ml | test/mt.cmj $stdlib
 o test/gpr_459_test.cmi test/gpr_459_test.cmj : cc test/gpr_459_test.ml | test/mt.cmj $stdlib
 o test/gpr_4639_test.cmi test/gpr_4639_test.cmj : cc test/gpr_4639_test.ml | $stdlib
-o test/gpr_4924_test.cmi test/gpr_4924_test.cmj : cc test/gpr_4924_test.ml | $stdlib
+o test/gpr_4900_test.cmi test/gpr_4900_test.cmj : cc test/gpr_4900_test.ml | test/mt.cmj $stdlib
+o test/gpr_4924_test.cmi test/gpr_4924_test.cmj : cc test/gpr_4924_test.ml | test/mt.cmj $stdlib
 o test/gpr_4931.cmi test/gpr_4931.cmj : cc test/gpr_4931.ml | $stdlib
 o test/gpr_627_test.cmi test/gpr_627_test.cmj : cc test/gpr_627_test.ml | test/mt.cmj $stdlib
 o test/gpr_658.cmi test/gpr_658.cmj : cc test/gpr_658.ml | $stdlib

jscomp/test/gpr_4900_test.js

@@ -0,0 +1,36 @@
+'use strict';
+
+var Mt = require("./mt.js");
+
+var suites = {
+  contents: /* [] */0
+};
+
+var id = {
+  contents: 0
+};
+
+function showToJs(x) {
+  return x !== 0;
+}
+
+Mt.eq_suites(id, suites, "File \"gpr_4900_test.ml\", line 15, characters 23-30", showToJs(/* Yes */1), true);
+
+Mt.eq_suites(id, suites, "File \"gpr_4900_test.ml\", line 16, characters 23-30", showToJs(/* No */0), false);
+
+Mt.eq_suites(id, suites, "File \"gpr_4900_test.ml\", line 17, characters 23-30", showToJs(/* After */{
+          _0: 3
+        }), true);
+
+Mt.from_pair_suites("File \"gpr_4900_test.ml\", line 19, characters 20-27", suites.contents);
+
+var from_pair_suites = Mt.from_pair_suites;
+
+var eq_suites = Mt.eq_suites;
+
+exports.from_pair_suites = from_pair_suites;
+exports.eq_suites = eq_suites;
+exports.suites = suites;
+exports.id = id;
+exports.showToJs = showToJs;
+/*  Not a pure module */

jscomp/test/gpr_4900_test.ml

@@ -0,0 +1,19 @@
+
+
+let {from_pair_suites;eq_suites} = (module Mt )
+
+let suites = ref []
+let id = ref 0
+type show = | No | After of int  | Yes 
+
+
+let showToJs x = 
+  match x with   
+  | Yes | After _ -> true 
+  | No -> false
+
+;; eq_suites id suites __LOC__ (showToJs Yes) true 
+;; eq_suites id suites __LOC__ (showToJs No) false 
+;; eq_suites id suites __LOC__ (showToJs (After 3)) true
+
+;; from_pair_suites __LOC__ !suites

jscomp/test/gpr_4924_test.js

@@ -1,5 +1,14 @@
 'use strict';
 
+var Mt = require("./mt.js");
+
+var suites = {
+  contents: /* [] */0
+};
+
+var id = {
+  contents: 0
+};
 
 function u(b) {
   if (b === 0) {
@@ -14,9 +23,17 @@ function u1(b) {
 }
 
 function u2(b) {
-  return b === 0;
+  return b !== 0;
 }
 
+Mt.eq_suites(id, suites, "File \"gpr_4924_test.ml\", line 25, characters 23-30", u2(/* A */0), false);
+
+Mt.eq_suites(id, suites, "File \"gpr_4924_test.ml\", line 26, characters 23-30", u2(/* B */1), true);
+
+Mt.eq_suites(id, suites, "File \"gpr_4924_test.ml\", line 27, characters 23-30", u2(/* C */{
+          _0: 2
+        }), true);
+
 function u3(b) {
   if (b === 0) {
     return 3;
@@ -41,11 +58,21 @@ function u6(b) {
   return b === 0;
 }
 
+Mt.from_pair_suites("File \"gpr_4924_test.ml\", line 49, characters 20-27", suites.contents);
+
+var from_pair_suites = Mt.from_pair_suites;
+
+var eq_suites = Mt.eq_suites;
+
+exports.from_pair_suites = from_pair_suites;
+exports.eq_suites = eq_suites;
+exports.suites = suites;
+exports.id = id;
 exports.u = u;
 exports.u1 = u1;
 exports.u2 = u2;
 exports.u3 = u3;
 exports.u4 = u4;
 exports.u5 = u5;
 exports.u6 = u6;
-/* No side effect */
+/*  Not a pure module */

jscomp/test/gpr_4924_test.ml

@@ -1,3 +1,7 @@
+let {from_pair_suites;eq_suites} = (module Mt )
+let suites = ref []
+let id = ref 0
+
 type t = 
   | A 
   | B 
@@ -18,6 +22,9 @@ let u2 b =
   | A -> false 
   | B | C _ -> true 
 
+;; eq_suites id suites __LOC__ (u2 A) false
+;; eq_suites id suites __LOC__ (u2 B ) true 
+;; eq_suites id suites __LOC__ (u2 (C 2)) true
 let u3 b = 
   match  b with 
   | A -> 3 
@@ -37,3 +44,6 @@ let u6 b =
   match  b with 
   | A -> true
   | _ -> false
+
+
+;; from_pair_suites __LOC__ !suites  

jscomp/test/ocaml_typedtree_test.js

@@ -27272,7 +27272,7 @@ function in_pervasives(p) {
 
 function is_datatype(decl) {
   var match = decl.type_kind;
-  return match === 0;
+  return match !== 0;
 }
 
 function object_fields(ty) {

lib/4.06.1/unstable/js_compiler.ml

@@ -95430,7 +95430,7 @@ let if_ (a : t) (b : t) (c : t) : t =
          | Lprim(
             {primitive = Pnot ; args = [Lprim{primitive = Pintcomp Ceq ; args = [Lvar j; Lconst _] as args; loc}]})
            when Ident.same i j && eq_approx true_ c
-           -> Lprim{primitive = Pintcomp Ceq; args; loc}
+           -> Lprim{primitive = Pintcomp Cneq; args; loc}
          | _ -> Lifthenelse(a,b,c)
          end 
        | _ ->  Lifthenelse (a,b,c))

lib/4.06.1/whole_compiler.ml

@@ -370881,7 +370881,7 @@ let if_ (a : t) (b : t) (c : t) : t =
          | Lprim(
             {primitive = Pnot ; args = [Lprim{primitive = Pintcomp Ceq ; args = [Lvar j; Lconst _] as args; loc}]})
            when Ident.same i j && eq_approx true_ c
-           -> Lprim{primitive = Pintcomp Ceq; args; loc}
+           -> Lprim{primitive = Pintcomp Cneq; args; loc}
          | _ -> Lifthenelse(a,b,c)
          end 
        | _ ->  Lifthenelse (a,b,c))