non special handling of creation of arity0

Author: bobzhang

jscomp/runtime/js.ml

@@ -57,7 +57,9 @@ type +'a t
     Absent cmi file when looking up module alias.
 *)
 module Fn = struct
-  type + 'a arity0 
+  type 'a arity0 = {
+    i0 : unit -> 'a [@internal]  
+  }
   type 'a arity1 = {
     i1 : 'a [@internal]
   }
@@ -135,7 +137,7 @@ module Internal = struct
   (* Use opaque instead of [._n] to prevent some optimizations happening *)
   external run : 'a arity0 -> 'a = "#run" 
   external opaque : 'a -> 'a = "%opaque"
-  external mk0 : (unit -> 'a0) -> 'a0 arity0 = "#fn_mk" "0"    
+
 end    
 (**/**)
 

jscomp/syntax/ast_uncurry_gen.ml

@@ -90,23 +90,17 @@ let to_uncurry_fn  loc (self : Bs_ast_mapper.mapper) (label : Asttypes.arg_label
       Ast_pat.is_unit_cont ~yes:0 ~no:len p           
     | _ -> len 
   in 
-  if arity = 0 && label = Nolabel then 
-    let txt = 
-      Longident.Ldot (Ast_literal.Lid.js_internal, "mk0") in
-    Parsetree.Pexp_apply (Exp.ident {txt;loc} , [ Nolabel, body])
-  else 
-    begin 
-      Bs_syntaxerr.err_large_arity loc arity;
-      let arity_s = string_of_int arity in   
-      Parsetree.Pexp_constraint(
-        Exp.record ~loc [
-          {
-            txt = Ast_literal.Lid.hidden_field arity_s;
-            loc
-          },body] None, Typ.constr ~loc {txt = Ldot (Ast_literal.Lid.js_fn,"arity"^arity_s);loc}
-          [Typ.any ~loc ()]
-      )
-    end
+  Bs_syntaxerr.err_large_arity loc arity;
+  let arity_s = string_of_int arity in   
+  Parsetree.Pexp_constraint(
+    Exp.record ~loc [
+      {
+        txt = Ast_literal.Lid.hidden_field arity_s;
+        loc
+      },body] None, Typ.constr ~loc {txt = Ldot (Ast_literal.Lid.js_fn,"arity"^arity_s);loc}
+      [Typ.any ~loc ()]
+  )
+
 
 
 

jscomp/test/uncurry_test.js

@@ -412,6 +412,12 @@ console.log(f21(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18
 
 console.log(f22(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21));
 
+function xx() {
+  while(true) {
+    continue ;
+  };
+}
+
 exports.f0 = f0;
 exports.f1 = f1;
 exports.f2 = f2;
@@ -435,4 +441,5 @@ exports.f19 = f19;
 exports.f20 = f20;
 exports.f21 = f21;
 exports.f22 = f22;
+exports.xx = xx;
 /*  Not a pure module */

jscomp/test/uncurry_test.ml

@@ -48,4 +48,6 @@ let f22= fun [@bs]a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17
 ;; f19 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 [@bs] |. Js.log 
 ;; f20 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 [@bs] |. Js.log 
 ;; f21 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [@bs] |. Js.log 
-;; f22 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 [@bs] |. Js.log 
+;; f22 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 [@bs] |. Js.log 
+
+let rec xx = fun [@bs] () -> xx () [@bs]

jscomp/test/uncurry_test.mli

@@ -264,3 +264,5 @@ val f22 :
    'a * 'b * 'c * 'd * 'e * 'f * 'g * 'h * 'i * 'j * 'k * 'l * 'm * 'n * 'o *
    'p * 'q * 'r * 's * 't * 'u * 'v
   [@bs])
+
+val xx : unit -> 'a [@bs]