Fix issue where optimizations for booleans would apply to user defined variants.

Author: cristianoc

jscomp/ml/matching.ml

@@ -2359,11 +2359,11 @@ let combine_constructor sw_names loc arg ex_pat cstr partial ctx def
                 else arg
               in 
                 Lifthenelse(arg, act2, act1)
-          | (2,0, [(i1,act1); (_,act2)],[]) ->
-              let arg = match act1 with
-                | Lconst (Const_pointer (_, Pt_constructor _ )) ->
-                  Lprim (Pintcomp(Ceq), [arg; act1], loc)
-                | _ -> arg in
+          | (2,0, [(i1,act1); (_,act2)],[]) when
+            (match act1, act2 with
+            | Lconst (Const_pointer (_, Pt_constructor _ )), _ -> false
+            | _, Lconst (Const_pointer (_, Pt_constructor _ )) -> false
+            | _ -> true) ->
               if i1 = 0 then Lifthenelse(arg, act2, act1)
               else Lifthenelse (arg, act1, act2)                
           | (n,0,_,[]) when false (* relies on tag being an int *) -> (* The type defines constant constructors only *)

jscomp/test/mario_game.js

@@ -1114,10 +1114,10 @@ function collide_block(check_xOpt, dir, obj) {
 }
 
 function opposite_dir(dir) {
-  if (dir === /* Right */1) {
-    return /* Left */0;
-  } else {
+  if (dir === /* Left */0) {
     return /* Right */1;
+  } else {
+    return /* Left */0;
   }
 }
 

jscomp/test/variantsMatching.js

@@ -28,26 +28,22 @@ function bar(x) {
 }
 
 function and_(x, y) {
-  if (x || y === /* True */0) {
-    return /* False */1;
+  if (x === /* True */0) {
+    return y;
   } else {
-    return /* True */0;
+    return /* False */1;
   }
 }
 
 function id(x) {
-  if (x === /* True */0) {
-    return /* False */1;
-  } else {
-    return /* True */0;
-  }
+  return x;
 }
 
 function not_(x) {
-  if (x === /* False */1) {
-    return /* True */0;
-  } else {
+  if (x === /* True */0) {
     return /* False */1;
+  } else {
+    return /* True */0;
   }
 }