improve the robustness of devbuild

- no cycle for cmi/cmj data sets
- not encoding version into cmi/cmj, when reading internals, it is already too late to detect

Author: bobzhang

jscomp/core/bs_cmi_load.ml

@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
+#if BS_RELEASE_BUILD then
 
 let load_cmi ~unit_name : Env.Persistent_signature.t option =
   match Config_util.find_opt (unit_name ^".cmi") with 
@@ -40,3 +40,32 @@ let load_cmi ~unit_name : Env.Persistent_signature.t option =
         Some {filename = Sys.executable_name ; 
               cmi }
       | None -> None
+
+let check () = 
+  Ext_array.iter 
+    Builtin_cmi_datasets.module_sets_cmi
+    (fun (name,l) ->
+       prerr_endline (">checking " ^ name);
+       let cmi = Lazy.force l in 
+       (match cmi.cmi_crcs with 
+        | (unit , Some digest) :: _  ->
+          Format.fprintf Format.err_formatter "%s -> %s@." unit (Digest.to_hex digest)
+        | _ -> ());
+       prerr_endline ("<checking " ^ name);
+    );
+  Ext_array.iter 
+    Builtin_cmj_datasets.module_sets
+    (fun (name,l) ->
+       prerr_endline (">checking " ^ name);
+       let cmj = Lazy.force l in 
+       Format.fprintf Format.err_formatter "%b@." cmj.pure;
+       prerr_endline ("<checking " ^ name);
+    ) 
+#else
+
+let check () = ()
+let load_cmi ~unit_name : Env.Persistent_signature.t option =
+  match Config_util.find_opt (unit_name ^".cmi") with 
+  | Some filename -> Some {filename; cmi = Cmi_format.read_cmi filename}
+  | None -> None 
+#end    

jscomp/core/builtin_check.ml

@@ -30,6 +30,7 @@
 
 
 let load_builin_unit unit_name : Js_cmj_format.cmj_load_info = 
+#if BS_RELEASE_BUILD then  
   match Ext_string_array.find_sorted_assoc 
           Builtin_cmj_datasets.module_sets
           unit_name with
@@ -43,7 +44,8 @@ let load_builin_unit unit_name : Js_cmj_format.cmj_load_info =
     {package_path =  
       Filename.dirname (Filename.dirname Sys.executable_name); cmj_table}
   | None
-    ->     
+    ->  
+#end         
     Bs_exception.error (Cmj_not_found unit_name)
 (* 
 let load_unit_no_file unit_name : Js_cmj_format.cmj_load_info = 

jscomp/core/js_cmj_load.ml

@@ -132,7 +132,7 @@ let () =
       get_files Literals.suffix_cmj stdlib @             
       get_files Literals.suffix_cmj "others") in 
   from_cmj cmj_files
-    (Filename.concat "core" "builtin_cmj_datasets.ml");
+    (Filename.concat "main" "builtin_cmj_datasets.ml");
   let cmi_files = 
     "runtime" // "js.cmi" ::       
     (get_files Literals.suffix_cmi stdlib @
@@ -143,5 +143,5 @@ let () =
        not (x |~ "internal"))
   in     
   from_cmi cmi_files
-    (Filename.concat "core" "builtin_cmi_datasets.ml")
+    (Filename.concat "main" "builtin_cmi_datasets.ml")
 

jscomp/core/builtin_cmi_datasets.ml jscomp/main/builtin_cmi_datasets.ml

@@ -209,7 +209,7 @@ let buckle_script_flags : (string * Arg.spec * string) list =
   ("-nostdlib", Arg.Set Js_config.no_stdlib,
     " Don't use stdlib")
   ::
-  ("-bs-internal-check", Arg.Unit (Builtin_check.check ),
+  ("-bs-internal-check", Arg.Unit (Bs_cmi_load.check ),
     " Built in check corrupted data"
   )
   ::  

jscomp/core/builtin_cmi_datasets.mli jscomp/main/builtin_cmi_datasets.mli

@@ -3,7 +3,8 @@ rule bspack
     command = ./bin/bspack.exe $flags -bs-main $main -o $out  $post_process
     depfile = $out.d
     generator = true
-
+native_ocaml_path = ../ocaml/
+snapshot_path = 4.06.1
 LTO= ../scripts/buckle_lto.js
 OCAML_SRC_UTILS=$native_ocaml_path/utils
 OCAML_SRC_PARSING=$native_ocaml_path/parsing
@@ -67,6 +68,8 @@ build $SNAP/unstable/js_compiler.ml: bspack | ./bin/bspack.exe
 build $SNAP/unstable/js_refmt_compiler.ml: bspack | ./bin/bspack.exe
     flags = -D BS_BROWSER=true -D BS_RELEASE_BUILD=true -bs-MD  -module-alias Config=Config_whole_compiler  -bs-exclude-I config   -I $OCAML_SRC_UTILS -I $OCAML_SRC_PARSING -I $OCAML_SRC_TYPING -I $OCAML_SRC_BYTECOMP -I $OCAML_SRC_DRIVER -I js_parser -I stubs -I ext -I syntax -I depends -I common -I core -I super_errors -I bsb -I outcome_printer -I js_parser -I main -I refmt
     main  = Jsoo_refmt_main
+
+subninja build.ninja    
 # -o $@
 # Check it later 
 # rule bsbnative

jscomp/core/builtin_cmj_datasets.ml jscomp/main/builtin_cmj_datasets.ml

@@ -52,17 +52,12 @@ let rec unroll_function_aux
 type t = { args : string list ; block :  string }
 
 let toString (x : t) = 
-  Bs_version.version ^ Marshal.to_string x []
+   Marshal.to_string x []
 
 (* exception handling*)
-let fromString (x : string) : t = 
-  if Ext_string.starts_with x Bs_version.version then 
-    Marshal.from_string x (String.length Bs_version.version)
-  else 
-     Ext_fmt.failwithf
-        ~loc:__LOC__
-        "Compiler version mismatch. The project might have been built with one version of BuckleScript, and then with another. Please wipe the artifacts and do a clean build."
-
+let fromString (x : string) : t =   
+    Marshal.from_string x 0
+  
 let handle_extension record_as_js_object e (self : Bs_ast_mapper.mapper)
     (({txt ; loc} as lid , payload) : Parsetree.extension) = 
   begin match txt with

jscomp/core/builtin_cmj_datasets.mli jscomp/main/builtin_cmj_datasets.mli

@@ -257,7 +257,7 @@ let bs_prefix_length = String.length bs_prefix
     1. fixed length
     2. non-prefix approach
 *)
-let bs_external = bs_prefix ^ Bs_version.version
+let bs_external = bs_prefix 
 
 
 let bs_external_length = String.length bs_external

jscomp/main/cmij_main.ml

@@ -1 +1 @@
-../lib/4.06.1/bsdep.ml: ../ocaml/driver/compdynlink.mli ../ocaml/driver/compenv.ml ../ocaml/driver/compenv.mli ../ocaml/driver/compmisc.ml ../ocaml/driver/compmisc.mli ../ocaml/driver/compplugin.ml ../ocaml/driver/compplugin.mli ../ocaml/driver/makedepend.ml ../ocaml/driver/makedepend.mli ../ocaml/driver/pparse.ml ../ocaml/driver/pparse.mli ../ocaml/parsing/ast_helper.ml ../ocaml/parsing/ast_helper.mli ../ocaml/parsing/ast_invariants.ml ../ocaml/parsing/ast_invariants.mli ../ocaml/parsing/ast_iterator.ml ../ocaml/parsing/ast_iterator.mli ../ocaml/parsing/ast_mapper.ml ../ocaml/parsing/ast_mapper.mli ../ocaml/parsing/asttypes.mli ../ocaml/parsing/builtin_attributes.ml ../ocaml/parsing/builtin_attributes.mli ../ocaml/parsing/depend.ml ../ocaml/parsing/depend.mli ../ocaml/parsing/docstrings.ml ../ocaml/parsing/docstrings.mli ../ocaml/parsing/lexer.ml ../ocaml/parsing/lexer.mli ../ocaml/parsing/location.ml ../ocaml/parsing/location.mli ../ocaml/parsing/longident.ml ../ocaml/parsing/longident.mli ../ocaml/parsing/parse.ml ../ocaml/parsing/parse.mli ../ocaml/parsing/parser.ml ../ocaml/parsing/parser.mli ../ocaml/parsing/parsetree.mli ../ocaml/parsing/syntaxerr.ml ../ocaml/parsing/syntaxerr.mli ../ocaml/tools/ocamldep.ml ../ocaml/utils/arg_helper.ml ../ocaml/utils/arg_helper.mli ../ocaml/utils/ccomp.ml ../ocaml/utils/ccomp.mli ../ocaml/utils/clflags.ml ../ocaml/utils/clflags.mli ../ocaml/utils/identifiable.ml ../ocaml/utils/identifiable.mli ../ocaml/utils/misc.ml ../ocaml/utils/misc.mli ../ocaml/utils/numbers.ml ../ocaml/utils/numbers.mli ../ocaml/utils/profile.ml ../ocaml/utils/profile.mli ../ocaml/utils/terminfo.ml ../ocaml/utils/terminfo.mli ../ocaml/utils/warnings.ml ../ocaml/utils/warnings.mli ./common/bs_loc.ml ./common/bs_loc.mli ./common/bs_version.ml ./common/bs_version.mli ./common/bs_warnings.ml ./common/bs_warnings.mli ./common/js_config.ml ./common/js_config.mli ./common/lam_methname.ml ./common/lam_methname.mli ./core/bs_cmi_load.ml ./core/bs_conditional_initial.ml ./core/bs_conditional_initial.mli ./core/builtin_cmi_datasets.ml ./core/builtin_cmi_datasets.mli ./core/config_util.ml ./core/config_util.mli ./core/config_whole_compiler.ml ./core/config_whole_compiler.mli ./core/js_raw_info.ml ./core/lam_constant.ml ./core/lam_constant.mli ./core/lam_pointer_info.ml ./core/lam_pointer_info.mli ./core/lam_tag_info.ml ./core/matching_polyfill.ml ./core/matching_polyfill.mli ./core/record_attributes_check.ml ./ext/bsc_warnings.ml ./ext/ext_array.ml ./ext/ext_array.mli ./ext/ext_bytes.ml ./ext/ext_bytes.mli ./ext/ext_char.ml ./ext/ext_char.mli ./ext/ext_filename.ml ./ext/ext_filename.mli ./ext/ext_fmt.ml ./ext/ext_json_parse.ml ./ext/ext_json_parse.mli ./ext/ext_json_types.ml ./ext/ext_list.ml ./ext/ext_list.mli ./ext/ext_option.ml ./ext/ext_option.mli ./ext/ext_pervasives.ml ./ext/ext_pervasives.mli ./ext/ext_position.ml ./ext/ext_position.mli ./ext/ext_ref.ml ./ext/ext_ref.mli ./ext/ext_string.ml ./ext/ext_string.mli ./ext/ext_string_array.ml ./ext/ext_string_array.mli ./ext/ext_utf8.ml ./ext/ext_utf8.mli ./ext/ext_util.ml ./ext/ext_util.mli ./ext/hash_set_gen.ml ./ext/hash_set_poly.ml ./ext/hash_set_poly.mli ./ext/hash_set_string.ml ./ext/hash_set_string.mli ./ext/literals.ml ./ext/literals.mli ./ext/map_gen.ml ./ext/map_string.ml ./ext/map_string.mli ./ext/set_gen.ml ./ext/set_string.ml ./ext/set_string.mli ./stubs/bs_hash_stubs.ml ./syntax/ast_attributes.ml ./syntax/ast_attributes.mli ./syntax/ast_bs_open.ml ./syntax/ast_bs_open.mli ./syntax/ast_comb.ml ./syntax/ast_comb.mli ./syntax/ast_compatible.ml ./syntax/ast_compatible.mli ./syntax/ast_core_type.ml ./syntax/ast_core_type.mli ./syntax/ast_core_type_class_type.ml ./syntax/ast_core_type_class_type.mli ./syntax/ast_derive.ml ./syntax/ast_derive.mli ./syntax/ast_derive_abstract.ml ./syntax/ast_derive_abstract.mli ./syntax/ast_derive_js_mapper.ml ./syntax/ast_derive_js_mapper.mli ./syntax/ast_derive_projector.ml ./syntax/ast_derive_projector.mli ./syntax/ast_derive_util.ml ./syntax/ast_derive_util.mli ./syntax/ast_exp.ml ./syntax/ast_exp.mli ./syntax/ast_exp_apply.ml ./syntax/ast_exp_apply.mli ./syntax/ast_exp_extension.ml ./syntax/ast_exp_extension.mli ./syntax/ast_exp_handle_external.ml ./syntax/ast_exp_handle_external.mli ./syntax/ast_external.ml ./syntax/ast_external.mli ./syntax/ast_external_mk.ml ./syntax/ast_external_mk.mli ./syntax/ast_external_process.ml ./syntax/ast_external_process.mli ./syntax/ast_literal.ml ./syntax/ast_literal.mli ./syntax/ast_open_cxt.ml ./syntax/ast_open_cxt.mli ./syntax/ast_pat.ml ./syntax/ast_pat.mli ./syntax/ast_payload.ml ./syntax/ast_payload.mli ./syntax/ast_polyvar.ml ./syntax/ast_polyvar.mli ./syntax/ast_signature.ml ./syntax/ast_signature.mli ./syntax/ast_structure.ml ./syntax/ast_structure.mli ./syntax/ast_tdcls.ml ./syntax/ast_tdcls.mli ./syntax/ast_tuple_pattern_flatten.ml ./syntax/ast_tuple_pattern_flatten.mli ./syntax/ast_typ_uncurry.ml ./syntax/ast_typ_uncurry.mli ./syntax/ast_utf8_string.ml ./syntax/ast_utf8_string.mli ./syntax/ast_utf8_string_interp.ml ./syntax/ast_utf8_string_interp.mli ./syntax/ast_util.ml ./syntax/ast_util.mli ./syntax/bs_ast_invariant.ml ./syntax/bs_ast_invariant.mli ./syntax/bs_ast_mapper.ml ./syntax/bs_ast_mapper.mli ./syntax/bs_builtin_ppx.ml ./syntax/bs_builtin_ppx.mli ./syntax/bs_syntaxerr.ml ./syntax/bs_syntaxerr.mli ./syntax/external_arg_spec.ml ./syntax/external_arg_spec.mli ./syntax/external_ffi_types.ml ./syntax/external_ffi_types.mli ./syntax/ppx_entry.ml ./syntax/reactjs_jsx_ppx_v2.ml ./syntax/reactjs_jsx_ppx_v3.ml 
+../lib/4.06.1/bsdep.ml: ../ocaml/driver/compdynlink.mli ../ocaml/driver/compenv.ml ../ocaml/driver/compenv.mli ../ocaml/driver/compmisc.ml ../ocaml/driver/compmisc.mli ../ocaml/driver/compplugin.ml ../ocaml/driver/compplugin.mli ../ocaml/driver/makedepend.ml ../ocaml/driver/makedepend.mli ../ocaml/driver/pparse.ml ../ocaml/driver/pparse.mli ../ocaml/parsing/ast_helper.ml ../ocaml/parsing/ast_helper.mli ../ocaml/parsing/ast_invariants.ml ../ocaml/parsing/ast_invariants.mli ../ocaml/parsing/ast_iterator.ml ../ocaml/parsing/ast_iterator.mli ../ocaml/parsing/ast_mapper.ml ../ocaml/parsing/ast_mapper.mli ../ocaml/parsing/asttypes.mli ../ocaml/parsing/builtin_attributes.ml ../ocaml/parsing/builtin_attributes.mli ../ocaml/parsing/depend.ml ../ocaml/parsing/depend.mli ../ocaml/parsing/docstrings.ml ../ocaml/parsing/docstrings.mli ../ocaml/parsing/lexer.ml ../ocaml/parsing/lexer.mli ../ocaml/parsing/location.ml ../ocaml/parsing/location.mli ../ocaml/parsing/longident.ml ../ocaml/parsing/longident.mli ../ocaml/parsing/parse.ml ../ocaml/parsing/parse.mli ../ocaml/parsing/parser.ml ../ocaml/parsing/parser.mli ../ocaml/parsing/parsetree.mli ../ocaml/parsing/syntaxerr.ml ../ocaml/parsing/syntaxerr.mli ../ocaml/tools/ocamldep.ml ../ocaml/utils/arg_helper.ml ../ocaml/utils/arg_helper.mli ../ocaml/utils/ccomp.ml ../ocaml/utils/ccomp.mli ../ocaml/utils/clflags.ml ../ocaml/utils/clflags.mli ../ocaml/utils/identifiable.ml ../ocaml/utils/identifiable.mli ../ocaml/utils/misc.ml ../ocaml/utils/misc.mli ../ocaml/utils/numbers.ml ../ocaml/utils/numbers.mli ../ocaml/utils/profile.ml ../ocaml/utils/profile.mli ../ocaml/utils/terminfo.ml ../ocaml/utils/terminfo.mli ../ocaml/utils/warnings.ml ../ocaml/utils/warnings.mli ./common/bs_loc.ml ./common/bs_loc.mli ./common/bs_version.ml ./common/bs_version.mli ./common/bs_warnings.ml ./common/bs_warnings.mli ./common/js_config.ml ./common/js_config.mli ./common/lam_methname.ml ./common/lam_methname.mli ./core/bs_cmi_load.ml ./core/bs_conditional_initial.ml ./core/bs_conditional_initial.mli ./core/config_util.ml ./core/config_util.mli ./core/config_whole_compiler.ml ./core/config_whole_compiler.mli ./core/js_cmj_format.ml ./core/js_cmj_format.mli ./core/js_packages_info.ml ./core/js_packages_info.mli ./core/js_raw_info.ml ./core/lam.ml ./core/lam.mli ./core/lam_arity.ml ./core/lam_arity.mli ./core/lam_compat.ml ./core/lam_compat.mli ./core/lam_constant.ml ./core/lam_constant.mli ./core/lam_pointer_info.ml ./core/lam_pointer_info.mli ./core/lam_primitive.ml ./core/lam_primitive.mli ./core/lam_tag_info.ml ./core/matching_polyfill.ml ./core/matching_polyfill.mli ./core/primitive_compat.ml ./core/primitive_compat.mli ./core/record_attributes_check.ml ./ext/bsc_warnings.ml ./ext/ext_arg.ml ./ext/ext_arg.mli ./ext/ext_array.ml ./ext/ext_array.mli ./ext/ext_bytes.ml ./ext/ext_bytes.mli ./ext/ext_char.ml ./ext/ext_char.mli ./ext/ext_cmj_magic.ml ./ext/ext_filename.ml ./ext/ext_filename.mli ./ext/ext_fmt.ml ./ext/ext_js_file_kind.ml ./ext/ext_json_parse.ml ./ext/ext_json_parse.mli ./ext/ext_json_types.ml ./ext/ext_list.ml ./ext/ext_list.mli ./ext/ext_option.ml ./ext/ext_option.mli ./ext/ext_pervasives.ml ./ext/ext_pervasives.mli ./ext/ext_position.ml ./ext/ext_position.mli ./ext/ext_ref.ml ./ext/ext_ref.mli ./ext/ext_string.ml ./ext/ext_string.mli ./ext/ext_string_array.ml ./ext/ext_string_array.mli ./ext/ext_utf8.ml ./ext/ext_utf8.mli ./ext/ext_util.ml ./ext/ext_util.mli ./ext/hash_set_gen.ml ./ext/hash_set_poly.ml ./ext/hash_set_poly.mli ./ext/hash_set_string.ml ./ext/hash_set_string.mli ./ext/literals.ml ./ext/literals.mli ./ext/map_gen.ml ./ext/map_string.ml ./ext/map_string.mli ./ext/set_gen.ml ./ext/set_string.ml ./ext/set_string.mli ./main/builtin_cmi_datasets.ml ./main/builtin_cmi_datasets.mli ./main/builtin_cmj_datasets.ml ./main/builtin_cmj_datasets.mli ./stubs/bs_hash_stubs.ml ./syntax/ast_attributes.ml ./syntax/ast_attributes.mli ./syntax/ast_bs_open.ml ./syntax/ast_bs_open.mli ./syntax/ast_comb.ml ./syntax/ast_comb.mli ./syntax/ast_compatible.ml ./syntax/ast_compatible.mli ./syntax/ast_core_type.ml ./syntax/ast_core_type.mli ./syntax/ast_core_type_class_type.ml ./syntax/ast_core_type_class_type.mli ./syntax/ast_derive.ml ./syntax/ast_derive.mli ./syntax/ast_derive_abstract.ml ./syntax/ast_derive_abstract.mli ./syntax/ast_derive_js_mapper.ml ./syntax/ast_derive_js_mapper.mli ./syntax/ast_derive_projector.ml ./syntax/ast_derive_projector.mli ./syntax/ast_derive_util.ml ./syntax/ast_derive_util.mli ./syntax/ast_exp.ml ./syntax/ast_exp.mli ./syntax/ast_exp_apply.ml ./syntax/ast_exp_apply.mli ./syntax/ast_exp_extension.ml ./syntax/ast_exp_extension.mli ./syntax/ast_exp_handle_external.ml ./syntax/ast_exp_handle_external.mli ./syntax/ast_external.ml ./syntax/ast_external.mli ./syntax/ast_external_mk.ml ./syntax/ast_external_mk.mli ./syntax/ast_external_process.ml ./syntax/ast_external_process.mli ./syntax/ast_literal.ml ./syntax/ast_literal.mli ./syntax/ast_open_cxt.ml ./syntax/ast_open_cxt.mli ./syntax/ast_pat.ml ./syntax/ast_pat.mli ./syntax/ast_payload.ml ./syntax/ast_payload.mli ./syntax/ast_polyvar.ml ./syntax/ast_polyvar.mli ./syntax/ast_signature.ml ./syntax/ast_signature.mli ./syntax/ast_structure.ml ./syntax/ast_structure.mli ./syntax/ast_tdcls.ml ./syntax/ast_tdcls.mli ./syntax/ast_tuple_pattern_flatten.ml ./syntax/ast_tuple_pattern_flatten.mli ./syntax/ast_typ_uncurry.ml ./syntax/ast_typ_uncurry.mli ./syntax/ast_utf8_string.ml ./syntax/ast_utf8_string.mli ./syntax/ast_utf8_string_interp.ml ./syntax/ast_utf8_string_interp.mli ./syntax/ast_util.ml ./syntax/ast_util.mli ./syntax/bs_ast_invariant.ml ./syntax/bs_ast_invariant.mli ./syntax/bs_ast_mapper.ml ./syntax/bs_ast_mapper.mli ./syntax/bs_builtin_ppx.ml ./syntax/bs_builtin_ppx.mli ./syntax/bs_syntaxerr.ml ./syntax/bs_syntaxerr.mli ./syntax/external_arg_spec.ml ./syntax/external_arg_spec.mli ./syntax/external_ffi_types.ml ./syntax/external_ffi_types.mli ./syntax/ppx_entry.ml ./syntax/reactjs_jsx_ppx_v2.ml ./syntax/reactjs_jsx_ppx_v3.ml