fix #5169

# Conflicts:
#	scripts/ninja.js

Author: bobzhang

jscomp/test/build.ninja

@@ -325,6 +325,7 @@ o test/gpr_4900_test.cmi test/gpr_4900_test.cmj : cc test/gpr_4900_test.ml | tes
 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_5071_test.cmi test/gpr_5071_test.cmj : cc test/gpr_5071_test.res | test/react.cmj $stdlib
+o test/gpr_5169_test.cmi test/gpr_5169_test.cmj : cc test/gpr_5169_test.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
 o test/gpr_858_test.cmi test/gpr_858_test.cmj : cc test/gpr_858_test.ml | $stdlib
@@ -479,6 +480,7 @@ o test/ocaml_typedtree_test.cmi : cc test/ocaml_typedtree_test.mli | $stdlib
 o test/of_string_test.cmi test/of_string_test.cmj : cc test/of_string_test.ml | test/mt.cmj $stdlib
 o test/offset.cmi test/offset.cmj : cc test/offset.ml | $stdlib
 o test/oo_js_test_date.cmi test/oo_js_test_date.cmj : cc test/oo_js_test_date.ml | test/mt.cmj $stdlib
+o test/option_encoding_test.cmi test/option_encoding_test.cmj : cc test/option_encoding_test.ml | $stdlib
 o test/option_repr_test.cmi test/option_repr_test.cmj : cc test/option_repr_test.ml | test/mt.cmj $stdlib
 o test/optional_ffi_test.cmi test/optional_ffi_test.cmj : cc test/optional_ffi_test.ml | test/mt.cmj $stdlib
 o test/optional_regression_test.cmi test/optional_regression_test.cmj : cc test/optional_regression_test.ml | test/mt.cmj $stdlib

jscomp/test/gpr_5169_test.js

@@ -0,0 +1,53 @@
+'use strict';
+
+
+var NotOption = {};
+
+var TotallyNotOption = {};
+
+var NotOption2 = {};
+
+var a;
+
+var b = 1;
+
+var c;
+
+var d = 1;
+
+var e;
+
+var f = 1;
+
+var g;
+
+var h = 1;
+
+var i = /* None */0;
+
+var j = /* Some */{
+  _0: 1
+};
+
+var k = /* None */0;
+
+var l = /* Some */{
+  _0: 1
+};
+
+exports.NotOption = NotOption;
+exports.a = a;
+exports.b = b;
+exports.c = c;
+exports.d = d;
+exports.TotallyNotOption = TotallyNotOption;
+exports.e = e;
+exports.f = f;
+exports.g = g;
+exports.h = h;
+exports.NotOption2 = NotOption2;
+exports.i = i;
+exports.j = j;
+exports.k = k;
+exports.l = l;
+/* No side effect */

jscomp/test/gpr_5169_test.ml

@@ -0,0 +1,29 @@
+module NotOption = struct
+
+  type 'a t = None | Some of 'a
+end
+
+let a = NotOption.None (* undefined *)
+let b = NotOption.Some(1) (* 1 *)
+let c = let open NotOption in None 
+let d = let open NotOption in Some(1) 
+
+
+module TotallyNotOption = struct
+  type 'a t = Some of ('a) | None
+end
+
+let e = TotallyNotOption.None (* undefined *)
+let f = TotallyNotOption.Some(1) (* 1 *)
+let g = let open TotallyNotOption in  None 
+let h = let open TotallyNotOption in Some(1) 
+
+
+module NotOption2 = struct
+  type 'a t = None | Some of 'a | Bogus
+end
+
+let i = NotOption2.None 
+let j = NotOption2.Some(1) 
+let k = let open NotOption2 in None 
+let l = let open NotOption2 in  Some(1) 

jscomp/test/option_encoding_test.js

@@ -0,0 +1,16 @@
+'use strict';
+
+
+var N = {};
+
+var u = [
+  undefined,
+  3
+];
+
+var h;
+
+exports.N = N;
+exports.u = u;
+exports.h = h;
+/* No side effect */

jscomp/test/option_encoding_test.ml

@@ -0,0 +1,24 @@
+[@@@config {
+  flags = [|
+    "-w";
+       "@A";
+    "-drawlambda";
+    "-dtypedtree";
+    "-bs-diagnose";
+    "-dparsetree";
+    (* "-dsource"; *)
+  |]
+}]
+
+
+module N = struct 
+  type 'a t = 'a option = 
+    | None    
+    | Some of 'a
+end   
+
+
+let u = N.(None, Some 3)
+
+
+let h = N.None

lib/4.06.1/unstable/js_compiler.ml

@@ -72567,7 +72567,9 @@ and transl_exp0 e =
           | Longident.Lident "None"
              when Datarepr.constructor_has_optional_shape cstr
             -> Pt_shape_none
-          | _ -> Pt_constructor {name = cstr.cstr_name; const = cstr.cstr_consts; non_const = cstr.cstr_nonconsts}        
+          | _ -> 
+            if Datarepr.constructor_has_optional_shape cstr then Pt_shape_none 
+            else Pt_constructor {name = cstr.cstr_name; const = cstr.cstr_consts; non_const = cstr.cstr_nonconsts}
           ))
       | Cstr_unboxed ->
           (match ll with [v] -> v | _ -> assert false)

lib/4.06.1/whole_compiler.ml

@@ -356391,7 +356391,9 @@ and transl_exp0 e =
           | Longident.Lident "None"
              when Datarepr.constructor_has_optional_shape cstr
             -> Pt_shape_none
-          | _ -> Pt_constructor {name = cstr.cstr_name; const = cstr.cstr_consts; non_const = cstr.cstr_nonconsts}        
+          | _ -> 
+            if Datarepr.constructor_has_optional_shape cstr then Pt_shape_none 
+            else Pt_constructor {name = cstr.cstr_name; const = cstr.cstr_consts; non_const = cstr.cstr_nonconsts}
           ))
       | Cstr_unboxed ->
           (match ll with [v] -> v | _ -> assert false)