Merge pull request #4447 from BuckleScript/fix_4442

fix #4442

Author: bobzhang

jscomp/core/classify_function.ml

@@ -26,7 +26,7 @@ let classify (prog : string) : Js_raw_info.exp =
   match Parser_flow.parse_expression 
     (Parser_env.init_env None prog) false with 
   | (_, Function {
-    id = None;
+    id = _;
     params = (_, {params});
     async = false;
     generator = false;

jscomp/test/build.ninja

@@ -324,6 +324,7 @@ build test/gpr_4274_test.cmi test/gpr_4274_test.cmj : cc test/gpr_4274_test.ml |
 build test/gpr_4280_test.cmi test/gpr_4280_test.cmj : cc test/gpr_4280_test.ml | test/mt.cmj $stdlib
 build test/gpr_4407_test.cmi test/gpr_4407_test.cmj : cc test/gpr_4407_test.ml | test/debug_mode_value.cmj test/mt.cmj $stdlib
 build test/gpr_441.cmi test/gpr_441.cmj : cc test/gpr_441.ml | $stdlib
+build test/gpr_4442_test.cmi test/gpr_4442_test.cmj : cc test/gpr_4442_test.ml | test/mt.cmj $stdlib
 build test/gpr_459_test.cmi test/gpr_459_test.cmj : cc test/gpr_459_test.ml | test/mt.cmj $stdlib
 build test/gpr_627_test.cmi test/gpr_627_test.cmj : cc test/gpr_627_test.ml | test/mt.cmj $stdlib
 build test/gpr_658.cmi test/gpr_658.cmj : cc test/gpr_658.ml | $stdlib

jscomp/test/gpr_4442_test.js

@@ -0,0 +1,34 @@
+'use strict';
+
+var Mt = require("./mt.js");
+
+var suites = {
+  contents: /* [] */0
+};
+
+var test_id = {
+  contents: 0
+};
+
+function eq(loc, x, y) {
+  return Mt.eq_suites(test_id, suites, loc, x, y);
+}
+
+var u = (function fib(n){
+  if(n===0||n==1){
+    return 1
+  }
+  return fib(n-1) + fib(n-2)
+});
+
+eq("File \"gpr_4442_test.ml\", line 14, characters 6-13", u(2), 2);
+
+eq("File \"gpr_4442_test.ml\", line 15, characters 6-13", u(3), 3);
+
+Mt.from_pair_suites("gpr_4442_test.ml", suites.contents);
+
+exports.suites = suites;
+exports.test_id = test_id;
+exports.eq = eq;
+exports.u = u;
+/*  Not a pure module */

jscomp/test/gpr_4442_test.ml

@@ -0,0 +1,17 @@
+
+let suites :  Mt.pair_suites ref  = ref []
+let test_id = ref 0
+let eq loc x y = Mt.eq_suites ~test_id ~suites loc x y 
+
+let u = [%raw{|function fib(n){
+  if(n===0||n==1){
+    return 1
+  }
+  return fib(n-1) + fib(n-2)
+}|}]
+
+
+;; eq __LOC__  (u 2) 2 
+;; eq __LOC__  (u 3) 3
+
+;; Mt.from_pair_suites __FILE__ !suites

lib/4.06.1/unstable/js_compiler.ml

@@ -110651,8 +110651,10 @@ module E = Js_exp_make
    Note if we inline {!Caml_exceptions.create}, 
    it seems can be useful for optimizations in theory, 
    in practice, it never happen, since the pattern match 
-   never dig into it internally, so maybe {!Obj.set_tag} 
-   is not necessary at all
+   never dig into it internally.
+   Alternative is to create a block `["xx"]` which relies on object identity
+   We try to avoid this, since inlining would break this, this would make reason
+   about the correctness of inlining more difficult
 *)
 let make exception_str  : J.expression = 
   E.runtime_call Js_runtime_modules.exceptions Literals.create [exception_str]
@@ -395508,7 +395510,7 @@ let classify (prog : string) : Js_raw_info.exp =
   match Parser_flow.parse_expression 
     (Parser_env.init_env None prog) false with 
   | (_, Function {
-    id = None;
+    id = _;
     params = (_, {params});
     async = false;
     generator = false;

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -110651,8 +110651,10 @@ module E = Js_exp_make
    Note if we inline {!Caml_exceptions.create}, 
    it seems can be useful for optimizations in theory, 
    in practice, it never happen, since the pattern match 
-   never dig into it internally, so maybe {!Obj.set_tag} 
-   is not necessary at all
+   never dig into it internally.
+   Alternative is to create a block `["xx"]` which relies on object identity
+   We try to avoid this, since inlining would break this, this would make reason
+   about the correctness of inlining more difficult
 *)
 let make exception_str  : J.expression = 
   E.runtime_call Js_runtime_modules.exceptions Literals.create [exception_str]
@@ -395508,7 +395510,7 @@ let classify (prog : string) : Js_raw_info.exp =
   match Parser_flow.parse_expression 
     (Parser_env.init_env None prog) false with 
   | (_, Function {
-    id = None;
+    id = _;
     params = (_, {params});
     async = false;
     generator = false;

lib/4.06.1/whole_compiler.ml

@@ -393245,8 +393245,10 @@ module E = Js_exp_make
    Note if we inline {!Caml_exceptions.create}, 
    it seems can be useful for optimizations in theory, 
    in practice, it never happen, since the pattern match 
-   never dig into it internally, so maybe {!Obj.set_tag} 
-   is not necessary at all
+   never dig into it internally.
+   Alternative is to create a block `["xx"]` which relies on object identity
+   We try to avoid this, since inlining would break this, this would make reason
+   about the correctness of inlining more difficult
 *)
 let make exception_str  : J.expression = 
   E.runtime_call Js_runtime_modules.exceptions Literals.create [exception_str]
@@ -398996,7 +398998,7 @@ let classify (prog : string) : Js_raw_info.exp =
   match Parser_flow.parse_expression 
     (Parser_env.init_env None prog) false with 
   | (_, Function {
-    id = None;
+    id = _;
     params = (_, {params});
     async = false;
     generator = false;