optimize assert false with the flag -bs-no-assertfalse, remove one unsafe primitive in Belt_List with this flag

Author: bobzhang

jscomp/core/lam.ml

@@ -737,6 +737,10 @@ let if_ (a : t) (b : t) (c : t) : t =
 
   | _ -> 
     match  b, c with 
+    | _, Lconst (Const_pointer (_, Pt_assertfalse))
+      -> seq a b (* TODO: we could customize more cases *)
+    | Lconst (Const_pointer (_, Pt_assertfalse)), _ 
+      -> seq a c
     | Lconst(Const_js_true), Lconst(Const_js_false)
       -> 
       if has_boolean_type a != None then a 

jscomp/core/lam_compile_util.ml

@@ -67,5 +67,8 @@ let comment_of_pointer_info (x :  Lam_pointer_info.t)=
   match x with 
   | Pt_constructor {name;_}
   | Pt_variant {name} -> Some name
-  (* | Pt_module_alias -> module_alias *)
+  | Pt_assertfalse -> Some "assert_false"
   | Pt_na -> None
+  | Pt_module_alias 
+  | Pt_builtin_boolean
+  | Pt_shape_none -> assert false

jscomp/core/lam_constant_convert.ml

@@ -38,17 +38,18 @@ let rec convert_constant ( const : Lambda.structured_constant) : Lam_constant.t
   | Const_base (Const_int32 i) -> (Const_int32 i)
   | Const_base (Const_int64 i) -> (Const_int64 i)
   | Const_base (Const_nativeint i) -> (Const_nativeint i)
-  | Const_pointer(0, Pt_constructor{name = "()"; cstrs = 1,0})
+  | Const_pointer(0, Pt_constructor{name = "()"; const = 1; non_const = 0})
     -> Const_js_undefined
   | Const_pointer(i,p) ->
     begin match p with 
-    | Pt_constructor {name;cstrs} -> Const_pointer(i, Pt_constructor {name; cstrs})
-    | Pt_variant {name} -> Const_pointer(i,Pt_variant {name})
-    | Pt_module_alias -> Const_module_alias
-    | Pt_builtin_boolean -> if i = 0 then Const_js_false else Const_js_true
-    | Pt_shape_none ->
-       Lam_constant.lam_none
-    | Pt_na ->  Const_pointer(i, Pt_na)      
+      | Pt_module_alias -> Const_module_alias
+      | Pt_builtin_boolean -> if i = 0 then Const_js_false else Const_js_true
+      | Pt_shape_none ->
+        Lam_constant.lam_none
+    | Pt_assertfalse    
+    | Pt_constructor _
+    | Pt_variant _    
+    | Pt_na ->  Const_pointer(i, p)      
      end 
   | Const_float_array (s) -> Const_float_array(s)
   | Const_immstring s -> Const_immstring s

jscomp/core/lam_pointer_info.ml

@@ -23,8 +23,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type t = 
-  | Pt_constructor of {name : string ; cstrs : int * int}
-  | Pt_variant of {name : string }
-  (* | Pt_module_alias *)
-  | Pt_na 
+type t = Lambda.pointer_info = 
+  | Pt_constructor of {name : string; const : int ; non_const :  int} 
+  | Pt_variant of {name : string}
+  | Pt_module_alias (* IMPOSSIBLE *)
+  | Pt_builtin_boolean (* IMPOSSIBLE *)
+  | Pt_shape_none (* IMPOSSIBLE *)  
+  | Pt_assertfalse
+  | Pt_na  
+

jscomp/core/lam_pointer_info.mli

@@ -23,8 +23,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type t = 
-  | Pt_constructor of {name : string ; cstrs : int * int}
-  | Pt_variant of { name : string}
-  (* | Pt_module_alias *)
-  | Pt_na 
+type t = Lambda.pointer_info = 
+  | Pt_constructor of {name : string; const : int ; non_const :  int} 
+  | Pt_variant of {name : string}
+  | Pt_module_alias (* IMPOSSIBLE *)
+  | Pt_builtin_boolean (* IMPOSSIBLE *)
+  | Pt_shape_none (* IMPOSSIBLE *)  
+  | Pt_assertfalse
+  | Pt_na  

jscomp/others/belt_List.ml

@@ -59,6 +59,8 @@
    ]}
 *)
 
+[@@@bs.config {flags = [| "-bs-noassertfalse" |]}]
+
 type 'a t = 'a list
 
 module A = Belt_Array
@@ -73,12 +75,7 @@ external mutableCell :
 *)
 external unsafeMutateTail :
   'a t -> 'a t -> unit = "#setfield1"
-(*
-   - the cell is not empty
-   - it is mutated
-*)
-external unsafeTail :
-  'a t -> 'a t = "%field1"
+
 (*
    - the cell is not empty
 *)
@@ -789,9 +786,9 @@ let partitionU l p  =
     let b = p h [@bs]  in
     partitionAux p t nextX nextY;
     if b then
-      nextX, unsafeTail nextY
+      nextX, (match nextY with _ :: tail -> tail | [] -> assert false)
     else
-      unsafeTail nextX, nextY
+      (match nextX with _ :: tail -> tail | [] -> assert false) , nextY
 
 let partition l p = partitionU l (fun [@bs] x -> p x)
 

jscomp/others/belt_internalMapInt.ml

@@ -1,7 +1,9 @@
-# 4 "others/internal_map.cppo.ml"
+# 1 "others/internal_map.cppo.ml"
+[@@@bs.config {flags = [| "-bs-noassertfalse" |]}]
+# 5 "others/internal_map.cppo.ml"
 type key = int
 
-# 9 "others/internal_map.cppo.ml"
+# 10 "others/internal_map.cppo.ml"
 module N = Belt_internalAVLtree
 module A = Belt_Array 
 module S = Belt_SortArray

jscomp/others/belt_internalMapString.ml

@@ -1,7 +1,9 @@
-# 2 "others/internal_map.cppo.ml"
+# 1 "others/internal_map.cppo.ml"
+[@@@bs.config {flags = [| "-bs-noassertfalse" |]}]
+# 3 "others/internal_map.cppo.ml"
 type key = string
 
-# 9 "others/internal_map.cppo.ml"
+# 10 "others/internal_map.cppo.ml"
 module N = Belt_internalAVLtree
 module A = Belt_Array 
 module S = Belt_SortArray

jscomp/others/internal_map.cppo.ml

@@ -1,3 +1,4 @@
+[@@@bs.config {flags = [| "-bs-noassertfalse" |]}]
 #ifdef TYPE_STRING
 type key = string
 #elif defined TYPE_INT

jscomp/others/release.ninja

@@ -1,5 +1,5 @@
 
-bsc_flags = -no-keep-locs -absname -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -nopervasives  -unsafe  -w +50 -warn-error A  -bs-noassertfalse -open Bs_stdlib_mini -I ./runtime
+bsc_flags = -no-keep-locs -absname -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -nopervasives  -unsafe  -w +50 -warn-error A  -open Bs_stdlib_mini -I ./runtime
 
 rule cc
     command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I others  $in

lib/es6/belt_internalMapInt.js

@@ -197,9 +197,6 @@ function mergeU(s1, s2, f) {
   } else if (s2 === undefined) {
     return ;
   }
-  if (s2 === undefined) {
-    return /* assert false */0;
-  }
   var v2 = s2.key;
   var d2 = s2.value;
   var l2 = s2.left;

lib/es6/belt_internalMapString.js

@@ -197,9 +197,6 @@ function mergeU(s1, s2, f) {
   } else if (s2 === undefined) {
     return ;
   }
-  if (s2 === undefined) {
-    return /* assert false */0;
-  }
   var v2 = s2.key;
   var d2 = s2.value;
   var l2 = s2.left;

lib/js/belt_internalMapInt.js

@@ -197,9 +197,6 @@ function mergeU(s1, s2, f) {
   } else if (s2 === undefined) {
     return ;
   }
-  if (s2 === undefined) {
-    return /* assert false */0;
-  }
   var v2 = s2.key;
   var d2 = s2.value;
   var l2 = s2.left;

lib/js/belt_internalMapString.js

@@ -197,9 +197,6 @@ function mergeU(s1, s2, f) {
   } else if (s2 === undefined) {
     return ;
   }
-  if (s2 === undefined) {
-    return /* assert false */0;
-  }
   var v2 = s2.key;
   var d2 = s2.value;
   var l2 = s2.left;

scripts/ninja.js

@@ -973,7 +973,7 @@ async function othersNinja(devmode = true) {
   var ninjaCwd = "others";
 
   var templateOthersRules = `
-bsc_flags = ${commonBsFlags} -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -nopervasives  -unsafe  -w +50 -warn-error A  -bs-noassertfalse -open Bs_stdlib_mini -I ./runtime
+bsc_flags = ${commonBsFlags} -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -nopervasives  -unsafe  -w +50 -warn-error A  -open Bs_stdlib_mini -I ./runtime
 ${ruleCC(ninjaCwd)}
 ${
   devmode