Move arity 0 onto new representation.

Author: cristianoc

jscomp/frontend/ast_typ_uncurry.ml

@@ -61,6 +61,5 @@ let to_uncurry_type loc (mapper : Bs_ast_mapper.mapper)
   let fn_type = Typ.arrow ~loc label first_arg typ in
   let arity = Ast_core_type.get_uncurry_arity fn_type in
   match arity with
-  | Some 0 -> Ast_uncurried.uncurriedType ~loc ~arity:0 typ
   | Some arity -> Ast_uncurried.uncurriedType ~loc ~arity fn_type
   | None -> assert false

jscomp/main/builtin_cmi_datasets.ml

@@ -1,6 +1,6 @@
 (* Untyped AST *)
 
-let new_representation arity = arity = 5
+let new_representation arity = arity = 0 || arity = 5
 
 let arityType ~loc arity =
   Ast_helper.Typ.variant ~loc

jscomp/main/builtin_cmj_datasets.ml

@@ -74,16 +74,13 @@
 type 'a t = < .. > as 'a
 (** JS object type *)
 
-type ('fn, 'arity) uncurried = Uncurried of 'fn [@unboxed]
-
 (**/**)
 
 (* internal types for FFI, these types are not used by normal users
     Absent cmi file when looking up module alias.
 *)
 
 module Fn = struct
-  type 'a arity0 = { i0 : unit -> 'a [@internal] }
   type 'a arity1 = { i1 : 'a [@internal] }
   type 'a arity2 = { i2 : 'a [@internal] }
   type 'a arity3 = { i3 : 'a [@internal] }
@@ -113,12 +110,10 @@ end
 module MapperRt = Js_mapperRt
 
 module Internal = struct
-  open Fn
-
   external opaqueFullApply : 'a -> 'a = "%uncurried_apply"
 
   (* Use opaque instead of [._n] to prevent some optimizations happening *)
-  external run : 'a arity0 -> 'a = "#run"
+  external run : (unit -> 'a [@bs]) -> 'a = "#run"
   external opaque : 'a -> 'a = "%opaque"
 end
 

jscomp/ml/ast_uncurried.ml

@@ -46,15 +46,10 @@
 type 'a t = < .. > as 'a
 (**/**)
 
-type ('fn, 'arity) uncurried = Uncurried of 'fn [@unboxed]
-
 (* internal types for FFI, these types are not used by normal users 
     Absent cmi file when looking up module alias.
 *)
 module Fn = struct
-  type 'a arity0 = {
-    i0 : unit -> 'a [@internal]  
-  }
   type 'a arity1 = {
     i1 : 'a [@internal]
   }
@@ -126,11 +121,10 @@ end
 (**/**)
 module MapperRt = Js_mapperRt
 module Internal = struct 
-  open Fn    
   external opaqueFullApply : 'a -> 'a = "%uncurried_apply"
 
   (* Use opaque instead of [._n] to prevent some optimizations happening *)
-  external run : 'a arity0 -> 'a = "#run" 
+  external run : (unit -> 'a [@bs]) -> 'a = "#run"
   external opaque : 'a -> 'a = "%opaque"
 
 end