improve hashtbl performance

Author: bobzhang

.gitignore

@@ -81,4 +81,5 @@ lib/bs
 lib/js/jscomp/test
 
 *.goog.js
-*.jsoo.js
+*.jsoo.js
+*.so

jscomp/Makefile

@@ -6,6 +6,7 @@ ifndef EXE
 endif
 .SECONDARY:
 NATIVE=ocamlopt.opt$(EXE)
+BYTE=ocamlc.opt$(EXE)
 OCAMLLEX=ocamllex.opt$(EXE)
 CAMLP4OF=camlp4of
 CAMLDEP=ocamldep.opt$(EXE)
@@ -16,7 +17,7 @@ COMPFLAGS= -g -w -40-30 -warn-error +a-40-30
 
 print-%  : ; @echo $* = $($*)
 
-INCLUDES= -I +compiler-libs -I ext -I common -I syntax -I depends -I core -I bsb -I ounit -I ounit_tests
+INCLUDES= -I +compiler-libs -I stubs -I ext -I common -I syntax -I depends -I core -I bsb -I ounit -I ounit_tests
 
 .mli.cmi:
 	$(NATIVE) $(INCLUDES) $(COMPFLAGS) -c $<
@@ -26,6 +27,23 @@ INCLUDES= -I +compiler-libs -I ext -I common -I syntax -I depends -I core -I bsb
 
 .mll.ml:
 	$(OCAMLLEX) $< -o $@ || (rm $@ && exit 2)
+
+
+## Stubs 
+.c.o:
+	$(NATIVE) -c $< -o $@
+
+STUBS_OBJS=stubs/ext_basic_hash_stubs.o
+
+dllbs_hash.so libbs_hash.a: $(STUBS_OBJS)
+	ocamlmklib $(STUBS_OBJS) -o bs_hash
+
+bs_hash.cmxa:stubs/bs_hash_stubs.ml libbs_hash.a
+	$(NATIVE) -a $< -o $@ -cclib libbs_hash.a
+
+bs_hash.cma:stubs/bs_hash_stubs.ml dllbs_hash.so
+	$(BYTE) -a $< -o $@ -dllib dllbs_hash.so
+
 ## native plugin was not installed in opam..
 
 ## Beging Rules only make sense in dev mode
@@ -48,17 +66,27 @@ common/bs_version.ml: build_version.js ../package.json
 ### list files
 OUNIT_SRCS = oUnit oUnitDiff oUnitLogger oUnitTypes oUnitUtils oUnitChooser
 OUNIT_CMXS = $(addprefix ounit/, $(addsuffix .cmx, $(OUNIT_SRCS)))
-OUNIT_TESTS_SRCS =  ounit_array_tests ounit_list_test ounit_bal_tree_tests ounit_path_tests ounit_union_find_tests ounit_hash_set_tests ounit_scc_tests ounit_json_tests ounit_vec_test ounit_tests_main
+OUNIT_TESTS_SRCS =  ounit_tests_util ounit_array_tests ounit_list_test ounit_bal_tree_tests ounit_path_tests ounit_union_find_tests ounit_hash_set_tests ounit_scc_tests ounit_json_tests ounit_vec_test ounit_tests_main
 OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))
 
-EXT_SRCS = ext_array ext_bytes ext_char resize_array string_vec int_vec int_vec_vec bal_set_common\
+EXT_SRCS = ext_array ext_bytes ext_char resize_array string_vec\
+	int_vec int_vec_vec bal_set_common\
 	bal_tree  bal_map_common bal_map\
-	ext_file_pp ext_format ext_hashtbl ext_list ext_map \
+	ext_file_pp ext_format \
+	hashtbl_gen \
+	ext_hashtbl \
+	string_hashtbl\
+	ext_list ext_map \
 	ext_marshal ext_option \
 	ext_pervasives ext_pp ext_ref ext_string ext_sys \
-	hash_set ordered_hash_set ordered_hash_map union_find \
+	hash_set_gen hash_set string_hash_set int_hash_set ordered_hash_set ordered_hash_map union_find \
 	ident_set int_map literals string_map \
-	string_set ext_scc ext_pp_scope ext_io ext_ident ext_filename
+	string_set ext_scc ext_pp_scope\
+	ext_io\
+	ext_ident\
+	ident_hashtbl\
+	int_hashtbl\
+	ext_filename
 
 EXT_CMXS=$(addprefix ext/, $(addsuffix .cmx, $(EXT_SRCS)))
 COMMON_SRCS= bs_version js_config bs_pkg ext_log bs_loc  bs_warnings  lam_methname  binary_cache
@@ -117,7 +145,7 @@ bin/bsb.exe: ext.cmxa common.cmxa  bsb.cmxa bsb/bsb_main.cmx
 # bin/bsc:  ext.cmxa common.cmxa  depends.cmxa syntax.cmxa core.cmxa
 # 	$(NATIVE) -g -linkall -I +compiler-libs ocamlcommon.cmxa $^ -o $@
 
-bin/bsc.exe: ext.cmxa common.cmxa syntax.cmxa depends.cmxa core.cmxa core/js_main.cmx
+bin/bsc.exe: bs_hash.cmxa ext.cmxa common.cmxa syntax.cmxa depends.cmxa core.cmxa core/js_main.cmx
 	@echo "Linking"
 	$(NATIVE) -g -linkall -I +compiler-libs ocamlcommon.cmxa $^ -o $@
 bin/jscmj.exe:ext.cmxa common.cmxa syntax.cmxa depends.cmxa core.cmxa  jscmj_main.cmx
@@ -185,7 +213,7 @@ bin/bsppx.ml:./bin/bspack.exe
 
 
 bin/whole_compiler.ml:./bin/bspack.exe
-	$< -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Js_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I ext -I syntax -I depends -I common -I core
+	$< -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Js_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I stubs -I ext -I syntax -I depends -I common -I core
 
 bin/bsdep.ml:./bin/bspack.exe
 	BS_OCAMLDEP=true $< -bs-MD  -prelude-str 'module Config = Config_bsdep'  -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I ../ocaml/tools -I common -I ext -I syntax -I depends -I core  -bs-main Ocamldep -o $@
@@ -212,18 +240,22 @@ bin/js_compiler.ml:./bin/bspack.exe
 	BS_COMPILER_IN_BROWSER=true bspack.exe -bs-MD  -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Jsoo_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I ext -I syntax -I depends -I common -I core
 
 bin/all_ounit_tests.ml:./bin/bspack.exe
-	$< -bs-MD   -I ounit -I ounit_tests  -I bsb -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Ounit_tests_main -o $@
+	$< -bs-MD   -I ounit -I ounit_tests  -I stubs -I bsb -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Ounit_tests_main -o $@
 -include bin/all_ounit_tests.d
 
-bin/all_ounit_tests.exe:bin/all_ounit_tests.mli bin/all_ounit_tests.ml
-	ocamlopt.opt -g -I bin -w -a unix.cmxa $^ -o $@
+bin/all_ounit_tests.exe: stubs/ext_basic_hash_stubs.c bin/all_ounit_tests.mli bin/all_ounit_tests.ml
+	$(NATIVE) -g -I bin -w -a unix.cmxa $^ -o $@
 
 test:bin/all_ounit_tests.exe
 	$^
+
+# bin/all_ounit_tests.i.exe: stubs/ext_basic_hash_stubs.c bin/all_ounit_tests.mli bin/all_ounit_tests.ml
+# 	$(NATIVE) -ppx /Users/hzhang295/.opam/4.02.3+local-git-master/lib/bisect_ppx/bisect_ppx -g -I bin -w -a unix.cmxa $^ -o $@
+
 .PHONY:ounit_test
 # TODO: Fix Me use its own configuration
 bin/js_compiler.byte:bin/js_compiler.mli bin/js_compiler.ml
-	ocamlc.opt -w -a -I bin bin/config_whole_compiler.mli bin/config_whole_compiler.ml $^ -no-check-prims -o $@
+	$(BYTE) -w -a -I bin bin/config_whole_compiler.mli bin/config_whole_compiler.ml $^ -no-check-prims -o $@
 
 
 

jscomp/all.depend

@@ -10,7 +10,8 @@ ext/ext_filename.cmx : ext/literals.cmx ext/ext_string.cmx \
     ext/ext_pervasives.cmx ext/ext_filename.cmi
 ext/ext_format.cmx : ext/ext_format.cmi
 ext/ext_hashtbl.cmx : ext/ext_hashtbl.cmi
-ext/ext_ident.cmx : ext/string_set.cmx ext/ext_string.cmx ext/ext_ident.cmi
+ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
+    ext/ext_string.cmx ext/ext_ident.cmi
 ext/ext_int.cmx :
 ext/ext_io.cmx : ext/ext_pervasives.cmx ext/ext_io.cmi
 ext/ext_list.cmx : ext/ext_list.cmi
@@ -25,9 +26,15 @@ ext/ext_ref.cmx : ext/ext_ref.cmi
 ext/ext_scc.cmx : ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_scc.cmi
 ext/ext_string.cmx : ext/ext_bytes.cmx ext/ext_string.cmi
 ext/ext_sys.cmx : ext/ext_sys.cmi
-ext/hash_set.cmx : ext/hash_set.cmi
+ext/hash_set.cmx : ext/hash_set_gen.cmx ext/hash_set.cmi
+ext/hash_set_gen.cmx :
+ext/hashtbl_gen.cmx :
+ext/ident_hashtbl.cmx : ext/hashtbl_gen.cmx ext/ext_ident.cmx \
+    ext/ident_hashtbl.cmi
 ext/ident_set.cmx : ext/ext_format.cmx ext/bal_set_common.cmx \
     ext/ident_set.cmi
+ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/int_hash_set.cmi
+ext/int_hashtbl.cmx : ext/hashtbl_gen.cmx ext/int_hashtbl.cmi
 ext/int_map.cmx : ext/int_map.cmi
 ext/int_vec.cmx : ext/resize_array.cmx ext/int_vec.cmi
 ext/int_vec_vec.cmx : ext/resize_array.cmx ext/int_vec.cmx \
@@ -36,6 +43,8 @@ ext/literals.cmx : ext/literals.cmi
 ext/ordered_hash_map.cmx : ext/ordered_hash_map.cmi
 ext/ordered_hash_set.cmx : ext/ordered_hash_set.cmi
 ext/resize_array.cmx : ext/ext_array.cmx ext/resize_array.cmi
+ext/string_hash_set.cmx : ext/hash_set_gen.cmx ext/string_hash_set.cmi
+ext/string_hashtbl.cmx : ext/hashtbl_gen.cmx ext/string_hashtbl.cmi
 ext/string_map.cmx : ext/bal_map_common.cmx ext/string_map.cmi
 ext/string_set.cmx : ext/bal_set_common.cmx ext/string_set.cmi
 ext/string_vec.cmx : ext/resize_array.cmx ext/string_vec.cmi
@@ -63,14 +72,19 @@ ext/ext_scc.cmi : ext/int_vec_vec.cmi ext/int_vec.cmi
 ext/ext_string.cmi :
 ext/ext_sys.cmi :
 ext/hash_set.cmi :
+ext/ident_hashtbl.cmi :
 ext/ident_set.cmi : ext/ext_format.cmi
+ext/int_hash_set.cmi : ext/hash_set.cmi
+ext/int_hashtbl.cmi :
 ext/int_map.cmi :
 ext/int_vec.cmi : ext/resize_array.cmi
 ext/int_vec_vec.cmi : ext/resize_array.cmi ext/int_vec.cmi
 ext/literals.cmi :
 ext/ordered_hash_map.cmi :
 ext/ordered_hash_set.cmi :
 ext/resize_array.cmi :
+ext/string_hash_set.cmi : ext/hash_set.cmi
+ext/string_hashtbl.cmi :
 ext/string_map.cmi :
 ext/string_set.cmi :
 ext/string_vec.cmi : ext/resize_array.cmi
@@ -178,9 +192,9 @@ depends/bs_exception.cmi :
 depends/depends_post_process.cmi :
 core/bs_conditional_initial.cmx : common/bs_version.cmx \
     core/bs_conditional_initial.cmi
-core/bspack_main.cmx : ext/ext_string.cmx ext/ext_pervasives.cmx \
-    ext/ext_list.cmx ext/ext_io.cmx ext/ext_filename.cmx \
-    depends/ast_extract.cmx core/bspack_main.cmi
+core/bspack_main.cmx : ext/string_hashtbl.cmx ext/ext_string.cmx \
+    ext/ext_pervasives.cmx ext/ext_list.cmx ext/ext_io.cmx \
+    ext/ext_filename.cmx depends/ast_extract.cmx core/bspack_main.cmi
 core/bspp_main.cmx : core/bspp_main.cmi
 core/bsppx_main.cmx : syntax/ppx_entry.cmx
 core/config_util.cmx : core/js_cmj_format.cmx depends/bs_exception.cmx \
@@ -260,15 +274,15 @@ core/js_pass_flatten.cmx : core/js_stmt_make.cmx core/js_map.cmx \
 core/js_pass_flatten_and_mark_dead.cmx : core/js_stmt_make.cmx \
     core/js_op_util.cmx core/js_map.cmx core/js_fold.cmx core/js_exp_make.cmx \
     common/js_config.cmx core/js_analyzer.cmx core/j.cmx ext/ident_set.cmx \
-    common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
-    core/js_pass_flatten_and_mark_dead.cmi
+    ext/ident_hashtbl.cmx common/ext_log.cmx ext/ext_list.cmx \
+    ext/ext_ident.cmx core/js_pass_flatten_and_mark_dead.cmi
 core/js_pass_scope.cmx : core/js_fun_env.cmx core/js_fold.cmx \
     core/js_closure.cmx ext/ident_set.cmx common/ext_log.cmx \
     core/js_pass_scope.cmi
 core/js_pass_tailcall_inline.cmx : core/js_stmt_make.cmx core/js_op_util.cmx \
     core/js_map.cmx core/js_fold.cmx core/js_exp_make.cmx \
-    core/js_analyzer.cmx core/j.cmx ext/ident_set.cmx ext/ext_list.cmx \
-    core/js_pass_tailcall_inline.cmi
+    core/js_analyzer.cmx core/j.cmx ext/ident_set.cmx ext/ident_hashtbl.cmx \
+    ext/ext_list.cmx core/js_pass_tailcall_inline.cmi
 core/js_program_loader.cmx : core/lam_module_ident.cmx \
     core/lam_compile_env.cmx core/js_stmt_make.cmx core/js_exp_make.cmx \
     common/js_config.cmx core/j.cmx ext/ident_set.cmx ext/ext_pervasives.cmx \
@@ -287,9 +301,10 @@ core/lam_analysis.cmx : core/lam.cmx ext/ident_set.cmx core/ident_map.cmx \
     core/lam_analysis.cmi
 core/lam_beta_reduce.cmx : core/lam_util.cmx core/lam_stats.cmx \
     core/lam_compile_global.cmx core/lam_beta_reduce_util.cmx \
-    core/lam_analysis.cmx core/lam.cmx core/ident_map.cmx ext/ext_hashtbl.cmx \
-    core/lam_beta_reduce.cmi
-core/lam_beta_reduce_util.cmx : core/lam.cmx core/lam_beta_reduce_util.cmi
+    core/lam_analysis.cmx core/lam.cmx core/ident_map.cmx \
+    ext/ident_hashtbl.cmx core/lam_beta_reduce.cmi
+core/lam_beta_reduce_util.cmx : core/lam.cmx ext/ident_hashtbl.cmx \
+    core/lam_beta_reduce_util.cmi
 core/lam_compile.cmx : ext/literals.cmx core/lam_util.cmx \
     common/lam_methname.cmx core/lam_exit_code.cmx \
     core/lam_compile_primitive.cmx core/lam_compile_global.cmx \
@@ -347,8 +362,8 @@ core/lam_compile_primitive.cmx : core/lam_util.cmx \
     core/lam_compile_primitive.cmi
 core/lam_compile_util.cmx : core/js_op.cmx core/lam_compile_util.cmi
 core/lam_dce.cmx : core/lam_group.cmx core/lam_analysis.cmx core/lam.cmx \
-    ext/ident_set.cmx ext/hash_set.cmx ext/ext_pervasives.cmx \
-    ext/ext_ident.cmx core/lam_dce.cmi
+    ext/ident_set.cmx ext/ident_hashtbl.cmx ext/hash_set.cmx \
+    ext/ext_pervasives.cmx ext/ext_ident.cmx core/lam_dce.cmi
 core/lam_dispatch_primitive.cmx : core/js_stmt_make.cmx \
     core/js_of_lam_tuple.cmx core/js_of_lam_option.cmx \
     core/js_of_lam_exception.cmx core/js_of_lam_array.cmx core/js_long.cmx \
@@ -366,22 +381,23 @@ core/lam_pass_alpha_conversion.cmx : core/lam_util.cmx \
     core/lam_stats_util.cmx core/lam_stats.cmx core/lam.cmx ext/ext_list.cmx \
     core/lam_pass_alpha_conversion.cmi
 core/lam_pass_collect.cmx : core/lam_util.cmx core/lam_stats_util.cmx \
-    core/lam_stats.cmx core/lam.cmx ext/ident_set.cmx ext/hash_set.cmx \
-    core/lam_pass_collect.cmi
+    core/lam_stats.cmx core/lam.cmx ext/ident_set.cmx ext/ident_hashtbl.cmx \
+    ext/hash_set.cmx core/lam_pass_collect.cmi
 core/lam_pass_exits.cmx : core/lam_util.cmx core/lam_beta_reduce.cmx \
-    core/lam_analysis.cmx core/lam.cmx core/ident_map.cmx \
+    core/lam_analysis.cmx core/lam.cmx ext/int_hashtbl.cmx core/ident_map.cmx \
     core/lam_pass_exits.cmi
 core/lam_pass_lets_dce.cmx : core/lam_util.cmx core/lam_beta_reduce.cmx \
     core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx core/ident_map.cmx \
-    ext/ext_list.cmx core/lam_pass_lets_dce.cmi
+    ext/ident_hashtbl.cmx ext/ext_list.cmx core/lam_pass_lets_dce.cmi
 core/lam_pass_remove_alias.cmx : core/lam_util.cmx core/lam_stats.cmx \
     core/lam_module_ident.cmx core/lam_inline_util.cmx \
     core/lam_compile_env.cmx core/lam_beta_reduce.cmx core/lam_analysis.cmx \
-    core/lam.cmx ext/ident_set.cmx ext/ext_list.cmx \
+    core/lam.cmx ext/ident_set.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
     core/lam_pass_remove_alias.cmi
 core/lam_print.cmx : core/lam.cmx core/lam_print.cmi
 core/lam_stats.cmx : core/lam_module_ident.cmx core/lam.cmx \
-    ext/ident_set.cmx ext/hash_set.cmx core/lam_stats.cmi
+    ext/ident_set.cmx ext/ident_hashtbl.cmx ext/hash_set.cmx \
+    core/lam_stats.cmi
 core/lam_stats_export.cmx : ext/string_map.cmx core/lam_stats_util.cmx \
     core/lam_stats.cmx core/lam_module_ident.cmx core/lam_inline_util.cmx \
     core/lam_compile_env.cmx core/lam_analysis.cmx core/lam.cmx \
@@ -390,12 +406,13 @@ core/lam_stats_export.cmx : ext/string_map.cmx core/lam_stats_util.cmx \
     ext/ext_option.cmx common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
     ext/ext_filename.cmx core/lam_stats_export.cmi
 core/lam_stats_util.cmx : core/lam_stats.cmx core/lam_compile_env.cmx \
-    core/lam.cmx ext/ext_list.cmx core/lam_stats_util.cmi
+    core/lam.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
+    core/lam_stats_util.cmi
 core/lam_util.cmx : ext/literals.cmx core/lam_stats.cmx core/lam_print.cmx \
     core/lam_module_ident.cmx core/lam_analysis.cmx core/lam.cmx \
     core/js_fold_basic.cmx common/js_config.cmx ext/ident_set.cmx \
-    core/ident_map.cmx ext/ext_list.cmx ext/ext_filename.cmx \
-    core/lam_util.cmi
+    core/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
+    ext/ext_filename.cmx core/lam_util.cmi
 core/ocaml_batch_compile.cmx : core/ocaml_parse.cmx \
     core/js_implementation.cmx common/js_config.cmx ext/ext_ref.cmx \
     ext/ext_pervasives.cmx ext/ext_format.cmx ext/ext_filename.cmx \
@@ -481,14 +498,14 @@ core/lam_module_ident.cmi : core/js_op.cmx common/js_config.cmi core/j.cmx
 core/lam_pass_alpha_conversion.cmi : core/lam_stats.cmi core/lam.cmi
 core/lam_pass_collect.cmi : core/lam_stats.cmi core/lam.cmi
 core/lam_pass_eliminate_ref.cmi :
-core/lam_pass_exits.cmi : core/lam.cmi
+core/lam_pass_exits.cmi : core/lam.cmi ext/int_hashtbl.cmi
 core/lam_pass_lets_dce.cmi : core/lam.cmi
 core/lam_pass_remove_alias.cmi : core/lam_stats.cmi core/lam.cmi
 core/lam_pass_unused_params.cmi : core/lam.cmi
 core/lam_print.cmi : core/lam.cmi
 core/lam_runtime.cmi :
 core/lam_stats.cmi : core/lam_module_ident.cmi core/lam.cmi \
-    ext/ident_set.cmi ext/hash_set.cmi
+    ext/ident_set.cmi ext/ident_hashtbl.cmi ext/hash_set.cmi
 core/lam_stats_export.cmi : core/lam_stats.cmi core/lam_module_ident.cmi \
     core/lam.cmi core/js_cmj_format.cmi core/ident_map.cmi
 core/lam_stats_util.cmi : core/lam_stats.cmi core/lam.cmi
@@ -553,10 +570,12 @@ ounit/oUnitTypes.cmx :
 ounit/oUnitUtils.cmx : ounit/oUnitTypes.cmx
 ounit_tests/ounit_array_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx \
     ext/ext_array.cmx
-ounit_tests/ounit_bal_tree_tests.cmx : ounit/oUnit.cmx ext/ext_int.cmx \
-    ext/bal_tree.cmx ext/bal_set_common.cmx
+ounit_tests/ounit_bal_tree_tests.cmx : ounit_tests/ounit_tests_util.cmx \
+    ounit/oUnit.cmx ext/ext_int.cmx ext/bal_tree.cmx ext/bal_set_common.cmx
 ounit_tests/ounit_hash_set_tests.cmx : ext/ordered_hash_set.cmx \
     ounit/oUnit.cmx ext/hash_set.cmx
+ounit_tests/ounit_hash_stubs_test.cmx : ounit_tests/ounit_tests_util.cmx \
+    ounit/oUnit.cmx ext/int_hash_set.cmx ext/hash_set.cmx
 ounit_tests/ounit_json_tests.cmx : ext/string_map.cmx ounit/oUnit.cmx \
     bsb/bsb_json.cmx
 ounit_tests/ounit_list_test.cmx : ounit/oUnit.cmx ext/ext_list.cmx
@@ -567,9 +586,11 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
     ounit_tests/ounit_vec_test.cmx ounit_tests/ounit_union_find_tests.cmx \
     ounit_tests/ounit_scc_tests.cmx ounit_tests/ounit_path_tests.cmx \
     ounit_tests/ounit_list_test.cmx ounit_tests/ounit_json_tests.cmx \
+    ounit_tests/ounit_hash_stubs_test.cmx \
     ounit_tests/ounit_hash_set_tests.cmx ounit_tests/ounit_bal_tree_tests.cmx \
     ounit_tests/ounit_array_tests.cmx ounit/oUnit.cmx \
     ounit_tests/ounit_tests_main.cmi
+ounit_tests/ounit_tests_util.cmx :
 ounit_tests/ounit_union_find_tests.cmx : ext/union_find.cmx ounit/oUnit.cmx \
     ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_string.cmx
 ounit_tests/ounit_vec_test.cmx : ounit/oUnit.cmx ext/int_vec.cmx \

jscomp/bin/Makefile

@@ -24,7 +24,7 @@ bsb_helper.exe:  bsb_helper.mli bsb_helper.ml
 config_whole_compiler.ml:config_whole_compiler.mlp ../config.js
 	node ../config.js
 bsc.exe: config_whole_compiler.mli config_whole_compiler.ml  whole_compiler.mli whole_compiler.ml
-	$(NATIVE) -w -a $^  -o $@
+	$(NATIVE) -w -a ../stubs/ext_basic_hash_stubs.c $^  -o $@
 
 bspack.exe: config_bspack.mli config_bspack.ml bspack.mli bspack.ml
 	$(NATIVE) -w -a unix.cmxa  $^ -o $@

jscomp/bin/all_ounit_tests.d

@@ -15,12 +15,18 @@ bin/all_ounit_tests.ml : ext/bal_set_common.ml
 bin/all_ounit_tests.ml : ext/bal_tree.ml
 bin/all_ounit_tests.ml : ext/bal_tree.mli
 bin/all_ounit_tests.ml : ext/ext_int.ml
+bin/all_ounit_tests.ml : ounit_tests/ounit_tests_util.ml
 bin/all_ounit_tests.ml : ounit_tests/ounit_bal_tree_tests.ml
+bin/all_ounit_tests.ml : ext/hash_set_gen.ml
 bin/all_ounit_tests.ml : ext/hash_set.ml
 bin/all_ounit_tests.ml : ext/hash_set.mli
 bin/all_ounit_tests.ml : ext/ordered_hash_set.ml
 bin/all_ounit_tests.ml : ext/ordered_hash_set.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_hash_set_tests.ml
+bin/all_ounit_tests.ml : stubs/bs_hash_stubs.ml
+bin/all_ounit_tests.ml : ext/int_hash_set.ml
+bin/all_ounit_tests.ml : ext/int_hash_set.mli
+bin/all_ounit_tests.ml : ounit_tests/ounit_hash_stubs_test.ml
 bin/all_ounit_tests.ml : ext/bal_map_common.ml
 bin/all_ounit_tests.ml : ext/string_map.ml
 bin/all_ounit_tests.ml : ext/string_map.mli