Merge pull request #997 from bloomberg/continue_specialization

specialize int vector

Author: bobzhang

jscomp/Makefile

@@ -34,10 +34,18 @@ ext/int_hash_set.ml: ext/hash_set.cppo.ml
 	cppo -D TYPE_INT $< -o $@
 ext/ident_hash_set.ml: ext/hash_set.cppo.ml
 	cppo -D TYPE_IDENT $< -o $@
+ext/hash_set.ml: ext/hash_set.cppo.ml
+	cppo -D TYPE_FUNCTOR $< -o $@
+ext/hash_set_poly.ml: ext/hash_set.cppo.ml
+	cppo $< -o $@
 
+ext/int_vec.ml: ext/vec.cppo.ml
+	cppo -D TYPE_INT $< -o $@
+ext/resize_array.ml: ext/vec.cppo.ml
+	cppo -D TYPE_FUNCTOR $< -o $@
 ## Stubs 
 .c.o:
-	$(NATIVE) -c $< -ccopt -o -ccopt $@
+	$(NATIVE) -ccopt -o -ccopt $@ -c $< 
 
 STUBS_OBJS=stubs/ext_basic_hash_stubs.o
 
@@ -73,12 +81,15 @@ common/bs_version.ml: build_version.js ../package.json
 STUB_SRCS = bs_hash_stubs
 OUNIT_SRCS = oUnit oUnitDiff oUnitLogger oUnitTypes oUnitUtils oUnitChooser
 OUNIT_CMXS = $(addprefix ounit/, $(addsuffix .cmx, $(OUNIT_SRCS)))
-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_SRCS =  ounit_tests_util ounit_array_tests ounit_list_test ounit_bal_tree_tests ounit_path_tests ounit_union_find_tests ounit_hash_stubs_test 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_util\
 	ext_int\
-	ext_array ext_bytes ext_char resize_array string_vec\
+	ext_array ext_bytes ext_char\
+	vec_gen \
+	resize_array \
+	string_vec\
 	int_vec int_vec_vec bal_set_common\
 	bal_tree  bal_map_common bal_map\
 	ext_file_pp ext_format \
@@ -91,11 +102,13 @@ EXT_SRCS = ext_util\
 	ext_pervasives ext_pp ext_ref  ext_sys \
 	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 \
+	ident_set\
+	int_map literals string_map \
 	string_set ext_scc ext_pp_scope\
 	ext_io\
 	ext_ident\
 	ident_hash_set\
+	hash_set_poly\
 	ident_hashtbl\
 	int_hashtbl\
 	ext_filename

jscomp/all.depend

@@ -4,9 +4,10 @@ ext/ext_int.cmx : ext/ext_int.cmi
 ext/ext_array.cmx : ext/ext_array.cmi
 ext/ext_bytes.cmx : ext/ext_bytes.cmi
 ext/ext_char.cmx : ext/ext_char.cmi
-ext/resize_array.cmx : ext/ext_array.cmx ext/resize_array.cmi
+ext/vec_gen.cmx : ext/ext_array.cmx
+ext/resize_array.cmx : ext/vec_gen.cmx ext/resize_array.cmi
 ext/string_vec.cmx : ext/resize_array.cmx ext/string_vec.cmi
-ext/int_vec.cmx : ext/resize_array.cmx ext/int_vec.cmi
+ext/int_vec.cmx : ext/vec_gen.cmx ext/int_vec.cmi
 ext/int_vec_vec.cmx : ext/resize_array.cmx ext/int_vec.cmx \
     ext/int_vec_vec.cmi
 ext/bal_set_common.cmx :
@@ -51,6 +52,7 @@ ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
     ext/ext_string.cmx ext/ext_ident.cmi
 ext/ident_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_ident.cmx \
     stubs/bs_hash_stubs.cmx ext/ident_hash_set.cmi
+ext/hash_set_poly.cmx : ext/hash_set_gen.cmx ext/hash_set_poly.cmi
 ext/ident_hashtbl.cmx : ext/hashtbl_gen.cmx ext/ext_ident.cmx \
     stubs/bs_hash_stubs.cmx ext/ident_hashtbl.cmi
 ext/int_hashtbl.cmx : ext/hashtbl_gen.cmx ext/ext_int.cmx \
@@ -62,10 +64,10 @@ ext/ext_int.cmi :
 ext/ext_array.cmi :
 ext/ext_bytes.cmi :
 ext/ext_char.cmi :
-ext/resize_array.cmi :
-ext/string_vec.cmi : ext/resize_array.cmi
-ext/int_vec.cmi : ext/resize_array.cmi
-ext/int_vec_vec.cmi : ext/resize_array.cmi ext/int_vec.cmi
+ext/resize_array.cmi : ext/vec_gen.cmx
+ext/string_vec.cmi : ext/vec_gen.cmx
+ext/int_vec.cmi : ext/vec_gen.cmx
+ext/int_vec_vec.cmi : ext/vec_gen.cmx ext/int_vec.cmi
 ext/bal_tree.cmi : ext/bal_set_common.cmx
 ext/bal_map.cmi : ext/bal_map_common.cmx
 ext/ext_file_pp.cmi :
@@ -97,6 +99,7 @@ ext/ext_pp_scope.cmi : ext/ident_set.cmi
 ext/ext_io.cmi :
 ext/ext_ident.cmi :
 ext/ident_hash_set.cmi : ext/hash_set_gen.cmx
+ext/hash_set_poly.cmi :
 ext/ident_hashtbl.cmi : ext/hashtbl_gen.cmx
 ext/int_hashtbl.cmi : ext/hashtbl_gen.cmx
 ext/ext_filename.cmi :
@@ -220,7 +223,7 @@ core/lam_stats.cmi : core/lam_module_ident.cmi core/lam.cmi \
 core/config_util.cmi : core/js_cmj_format.cmi
 core/lam_compile_defs.cmi : core/lam_stats.cmi core/j.cmx core/ident_map.cmi
 core/js_fold_basic.cmi : core/lam_module_ident.cmi core/j.cmx \
-    ext/ident_set.cmi ext/hash_set.cmi
+    ext/ident_set.cmi ext/hash_set_poly.cmi
 core/js_pass_scope.cmi : core/j.cmx ext/ident_set.cmi
 core/js_op_util.cmi : core/js_op.cmx core/j.cmx
 core/js_analyzer.cmi : core/j.cmx ext/ident_set.cmi
@@ -249,7 +252,7 @@ core/js_pass_flatten_and_mark_dead.cmi : core/j.cmx
 core/js_ast_util.cmi : core/j.cmx
 core/lam_dce.cmi : core/lam_group.cmi
 core/lam_compile_env.cmi : core/lam_module_ident.cmi core/lam.cmi \
-    common/js_config.cmi core/js_cmj_format.cmi ext/hash_set.cmi
+    common/js_config.cmi core/js_cmj_format.cmi ext/hash_set_poly.cmi
 core/lam_stats_util.cmi : core/lam_stats.cmi core/lam.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
@@ -322,7 +325,7 @@ core/lam_compile_defs.cmx : core/lam_stats.cmx core/j.cmx core/ident_map.cmx \
 core/js_map.cmx : core/j.cmx
 core/js_fold.cmx : core/j.cmx
 core/js_fold_basic.cmx : core/lam_module_ident.cmx core/js_fold.cmx \
-    common/js_config.cmx core/j.cmx ext/ident_set.cmx ext/hash_set.cmx \
+    common/js_config.cmx core/j.cmx ext/ident_set.cmx ext/hash_set_poly.cmx \
     ext/ext_ident.cmx core/js_fold_basic.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 \
@@ -390,7 +393,7 @@ core/lam_group_pass.cmx : core/lam.cmx
 core/lam_compile_env.cmx : core/type_util.cmx ext/string_map.cmx \
     core/lam_module_ident.cmx core/lam.cmx core/js_stmt_make.cmx \
     core/js_exp_make.cmx common/js_config.cmx core/js_cmj_format.cmx \
-    ext/hash_set.cmx ext/ext_ident.cmx core/config_util.cmx \
+    ext/hash_set_poly.cmx ext/ext_ident.cmx core/config_util.cmx \
     core/lam_compile_env.cmi
 core/lam_stats_util.cmx : core/lam_stats.cmx core/lam_compile_env.cmx \
     core/lam.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
@@ -537,8 +540,12 @@ ounit_tests/ounit_bal_tree_tests.cmx : ounit_tests/ounit_tests_util.cmx \
 ounit_tests/ounit_path_tests.cmx : ounit/oUnit.cmx ext/ext_filename.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_hash_stubs_test.cmx : ounit_tests/ounit_tests_util.cmx \
+    ounit/oUnit.cmx ext/int_hash_set.cmx ext/hash_set_poly.cmx \
+    stubs/bs_hash_stubs.cmx
 ounit_tests/ounit_hash_set_tests.cmx : ext/string_hash_set.cmx \
-    ext/ordered_hash_set.cmx ounit/oUnit.cmx ext/hash_set.cmx
+    ext/ordered_hash_set.cmx ounit/oUnit.cmx ext/hash_set_poly.cmx \
+    ext/hash_set.cmx
 ounit_tests/ounit_scc_tests.cmx : ounit/oUnit.cmx ext/int_vec_vec.cmx \
     ext/int_vec.cmx ext/ext_string.cmx ext/ext_scc.cmx
 ounit_tests/ounit_json_tests.cmx : ext/string_map.cmx ounit/oUnit.cmx \

jscomp/bin/all_ounit_tests.d

@@ -23,6 +23,8 @@ bin/all_ounit_tests.ml : ext/ext_util.mli
 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/hash_set_poly.ml
+bin/all_ounit_tests.ml : ext/hash_set_poly.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 : stubs/bs_hash_stubs.ml
@@ -48,10 +50,11 @@ bin/all_ounit_tests.ml : ext/literals.mli
 bin/all_ounit_tests.ml : ext/ext_filename.ml
 bin/all_ounit_tests.ml : ext/ext_filename.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_path_tests.ml
-bin/all_ounit_tests.ml : ext/resize_array.ml
-bin/all_ounit_tests.ml : ext/resize_array.mli
+bin/all_ounit_tests.ml : ext/vec_gen.ml
 bin/all_ounit_tests.ml : ext/int_vec.ml
 bin/all_ounit_tests.ml : ext/int_vec.mli
+bin/all_ounit_tests.ml : ext/resize_array.ml
+bin/all_ounit_tests.ml : ext/resize_array.mli
 bin/all_ounit_tests.ml : ext/int_vec_vec.ml
 bin/all_ounit_tests.ml : ext/int_vec_vec.mli
 bin/all_ounit_tests.ml : ext/ext_scc.ml