Apply changes accordingly

Check the output of ocamlobjinfo bsb_helper.cmx make sure unused dependency not pulled in

Author: bobzhang

jscomp/bsb/bsb_ninja_file_groups.ml

@@ -37,7 +37,7 @@ let handle_generators oc
   Ext_list.iter group.generators (fun {output; input; command} -> 
       (*TODO: add a loc for better error message *)
       match String_map.find_opt custom_rules command with 
-      | None -> Ext_pervasives.failwithf ~loc:__LOC__ "custom rule %s used but  not defined" command
+      | None -> Ext_fmt.failwithf ~loc:__LOC__ "custom rule %s used but  not defined" command
       | Some rule -> 
         Bsb_ninja_targets.output_build oc 
           ~outputs:(Ext_list.map  output  map_to_source_dir)

jscomp/bsb_helper/bsb_db_decode.ml

@@ -93,7 +93,9 @@ let read_build_cache ~dir  : t =
     Ext_io.load_file (Filename.concat dir bsbuild_cache) in   
   decode_internal all_content (ref (Ext_digest.length + 1)), all_content
 
-let cmp (a : string) b = String_map.compare_key a b   
+(* Invariant: the same as encoding String_map.compare_key  *)  
+let cmp  =  Ext_string.compare
+    
 
 let rec binarySearchAux (arr : string array) (lo : int) (hi : int) (key : string)  : _ option = 
   let mid = (lo + hi)/2 in 
@@ -129,7 +131,7 @@ let find_opt_aux sorted key  : _ option =
 
 
 type module_info =  {
-  case : Bsb_db.case; 
+  case : bool ; (* which is Bsb_db.case*)
   dir_name : string
 } 
 

jscomp/bsb_helper/bsb_db_decode.mli

@@ -48,7 +48,7 @@ val read_build_cache :
 
 
 type module_info = {
-  case : Bsb_db.case;
+  case : bool (* Bsb_db.case*);
   dir_name : string
 } 
 

jscomp/common/js_config.ml

@@ -30,19 +30,19 @@
 (* let add_npm_package_path s =
   match !packages_info  with
   | Empty ->
-    Ext_pervasives.bad_argf "please set package name first using -bs-package-name ";
+    Ext_arg.bad_argf "please set package name first using -bs-package-name ";
   | NonBrowser(name,  envs) ->
     let env, path =
       match Ext_string.split ~keep_empty:false s ':' with
       | [ package_name; path]  ->
         (match Js_packages_info.module_system_of_string package_name with
          | Some x -> x
          | None ->
-           Ext_pervasives.bad_argf "invalid module system %s" package_name), path
+           Ext_arg.bad_argf "invalid module system %s" package_name), path
       | [path] ->
         NodeJS, path
       | _ ->
-        Ext_pervasives.bad_argf "invalid npm package path: %s" s
+        Ext_arg.bad_argf "invalid npm package path: %s" s
     in
     packages_info := NonBrowser (name,  ((env,path) :: envs)) *)
 (** Browser is not set via command line only for internal use *)

jscomp/core/js_cmj_format.ml

@@ -88,7 +88,7 @@ let digest_length = 16 (*16 chars *)
 let verify_magic_in_beg ic =
   let buffer = really_input_string ic cmj_magic_number_length in 
   if buffer <> cmj_magic_number then
-    Ext_pervasives.failwithf ~loc:__LOC__ 
+    Ext_fmt.failwithf ~loc:__LOC__ 
       "cmj files have incompatible versions, please rebuilt using the new compiler : %s" 
         __LOC__
 
@@ -116,7 +116,7 @@ let from_string s : t =
   if magic_number = cmj_magic_number then 
     Marshal.from_string s  (digest_length + cmj_magic_number_length)
   else 
-    Ext_pervasives.failwithf ~loc:__LOC__ 
+    Ext_fmt.failwithf ~loc:__LOC__ 
       "cmj files have incompatible versions, please rebuilt using the new compiler : %s"
         __LOC__
 

jscomp/core/js_exp_make.ml

@@ -1128,6 +1128,15 @@ let int32_lsl ?comment (e1 : J.expression) (e2 : J.expression) : J.expression =
       expression_desc = Bin (Lsl, e1,e2)
     }
 
+let  is_pos_pow n = 
+  let module M = struct exception E end in 
+  let rec aux c (n : Int32.t) = 
+    if n <= 0l then -2 
+    else if n = 1l then c 
+    else if Int32.logand n 1l =  0l then   
+      aux (c + 1) (Int32.shift_right n 1 )
+    else raise_notrace M.E in 
+  try aux 0 n  with M.E -> -1
 
 let int32_mul ?comment 
     (e1 : J.expression) 
@@ -1144,7 +1153,7 @@ let int32_mul ?comment
   | e , {expression_desc = Number (Int {i = i0} | Uint i0 ); _}
   | {expression_desc = Number (Int {i = i0} | Uint i0 ); _}, e 
     -> 
-    let i =  Ext_pervasives.is_pos_pow i0  in 
+    let i =  is_pos_pow i0  in 
     if i >= 0 then 
       int32_lsl e (small_int i)
     else 

jscomp/core/js_packages_info.ml

@@ -228,23 +228,23 @@ let get_output_dir
 
 let add_npm_package_path (packages_info : t) (s : string)  : t =
   if is_empty packages_info then 
-    Ext_pervasives.bad_argf "please set package name first using -bs-package-name "
+    Ext_arg.bad_argf "please set package name first using -bs-package-name "
   else   
     let module_system, path =
       match Ext_string.split ~keep_empty:false s ':' with
       | [ module_system; path]  ->
         (match module_system_of_string module_system with
          | Some x -> x
          | None ->
-           Ext_pervasives.bad_argf "invalid module system %s" module_system), path
+           Ext_arg.bad_argf "invalid module system %s" module_system), path
       | [path] ->
         NodeJS, path
       | module_system :: path -> 
         (match module_system_of_string module_system with 
         | Some x -> x
-        | None -> Ext_pervasives.bad_argf "invalid module system %s" module_system), (String.concat ":" path)
+        | None -> Ext_arg.bad_argf "invalid module system %s" module_system), (String.concat ":" path)
       | _ ->
-        Ext_pervasives.bad_argf "invalid npm package path: %s" s
+        Ext_arg.bad_argf "invalid npm package path: %s" s
     in
     { packages_info with module_systems = {module_system; path}::packages_info.module_systems}
 

jscomp/core/js_packages_state.ml

@@ -31,7 +31,7 @@ let set_package_name name =
   if Js_packages_info.is_empty !packages_info then 
       packages_info := Js_packages_info.from_name name
   else
-    Ext_pervasives.bad_argf "duplicated flag for -bs-package-name"
+    Ext_arg.bad_argf "duplicated flag for -bs-package-name"
 
 let set_package_map module_name = 
     (* set_package_name name ; 

jscomp/core/lam_compile_main.ml

@@ -213,7 +213,7 @@ let compile
     if Js_config.is_same_file () then
       let f =
         Ext_filename.new_extension !Location.input_name  ".lambda" in
-      Ext_pervasives.with_file_as_pp f begin fun fmt ->
+      Ext_fmt.with_file_as_pp f begin fun fmt ->
         Format.pp_print_list ~pp_sep:Format.pp_print_newline
           (Lam_group.pp_group env) fmt (coerced_input.groups) 
       end;

jscomp/core/lam_convert.ml

@@ -60,7 +60,7 @@ let exception_id_destructed (l : Lam.t) (fv : Ident.t): bool  =
   | Some a -> hit a   
   and hit_list_snd : 'a. ('a * _ ) list -> bool = fun x ->    
     Ext_list.exists_snd  x  hit
-  and hit_list xs = List.exists hit xs 
+  and hit_list xs = Ext_list.exists xs hit 
   and hit (l : Lam.t) =
     match l  with
     | Lprim {primitive = Pintcomp _ ;