Skip to content

Commit dd32b4a

Browse files
authored
Merge pull request #1035 from bloomberg/global_exports
eliminate alias as early as possible
2 parents dbf8aee + 517431c commit dd32b4a

34 files changed

+1838
-920
lines changed

jscomp/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ ext/ordered_hash_set_make.ml : ext/ordered_hash_set.cppo.ml
7575
ext/ordered_hash_set_string.ml:ext/ordered_hash_set.cppo.ml
7676
cppo -D TYPE_STRING $< -o $@
7777

78+
ext/ordered_hash_set_ident.ml:ext/ordered_hash_set.cppo.ml
79+
cppo -D TYPE_IDENT $< -o $@
80+
7881
ext/string_hashtbl.ml: ext/hashtbl.cppo.ml
7982
cppo -D TYPE_STRING $< -o $@
8083
ext/int_hashtbl.ml: ext/hashtbl.cppo.ml
@@ -153,12 +156,13 @@ EXT_SRCS = ext_util\
153156
ext_marshal ext_option \
154157
ext_pervasives ext_pp ext_ref ext_sys \
155158
hash_set_gen hash_set string_hash_set int_hash_set \
159+
ext_ident\
156160
ordered_hash_set_gen\
157161
ordered_hash_set_string\
162+
ordered_hash_set_ident\
158163
ordered_hash_set_make\
159164
ordered_hash_map_gen\
160165
union_find \
161-
ext_ident\
162166
ident_map\
163167
ident_set\
164168
hashtbl_make\
@@ -199,7 +203,9 @@ CORE_SRCS= type_int_to_string type_util ocaml_stdlib_slots bs_conditional_initi
199203
lam_stats_export lam_pass_alpha_conversion lam_pass_collect js_program_loader js_dump js_pass_debug\
200204
js_of_lam_option js_output lam_compile_global lam_dispatch_primitive lam_beta_reduce\
201205
lam_compile_external_call lam_compile_primitive lam_compile lam_pass_exits\
202-
lam_pass_lets_dce lam_pass_remove_alias lam_compile_group\
206+
lam_pass_count\
207+
lam_pass_lets_dce \
208+
lam_pass_remove_alias lam_compile_group\
203209
js_implementation ocaml_batch_compile
204210
CORE_CMXS=$(addprefix core/, $(addsuffix .cmx, $(CORE_SRCS)))
205211

jscomp/all.depend

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,19 @@ ext/string_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_string.cmx \
3333
stubs/bs_hash_stubs.cmx ext/string_hash_set.cmi
3434
ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_int.cmx \
3535
stubs/bs_hash_stubs.cmx ext/int_hash_set.cmi
36+
ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
37+
ext/ext_string.cmx ext/ext_ident.cmi
3638
ext/ordered_hash_set_gen.cmx : ext/ext_util.cmx
3739
ext/ordered_hash_set_string.cmx : ext/ordered_hash_set_gen.cmx \
38-
ext/ext_string.cmx stubs/bs_hash_stubs.cmx \
40+
ext/ext_util.cmx ext/ext_string.cmx stubs/bs_hash_stubs.cmx \
3941
ext/ordered_hash_set_string.cmi
40-
ext/ordered_hash_set_make.cmx : ext/ordered_hash_set_gen.cmx
42+
ext/ordered_hash_set_ident.cmx : ext/ordered_hash_set_gen.cmx \
43+
ext/ext_util.cmx ext/ext_ident.cmx stubs/bs_hash_stubs.cmx \
44+
ext/ordered_hash_set_ident.cmi
45+
ext/ordered_hash_set_make.cmx : ext/ordered_hash_set_gen.cmx \
46+
ext/ext_util.cmx
4147
ext/ordered_hash_map_gen.cmx : ext/ext_util.cmx
4248
ext/union_find.cmx : ext/union_find.cmi
43-
ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
44-
ext/ext_string.cmx ext/ext_ident.cmi
4549
ext/ident_map.cmx : ext/map_gen.cmx ext/ext_ident.cmx ext/ident_map.cmi
4650
ext/ident_set.cmx : ext/set_gen.cmx ext/ident_set.cmi
4751
ext/hashtbl_make.cmx : ext/hashtbl_gen.cmx ext/hashtbl_make.cmi
@@ -92,9 +96,10 @@ ext/ext_sys.cmi :
9296
ext/hash_set.cmi : ext/hash_set_gen.cmx
9397
ext/string_hash_set.cmi : ext/hash_set_gen.cmx
9498
ext/int_hash_set.cmi : ext/hash_set_gen.cmx
99+
ext/ext_ident.cmi :
95100
ext/ordered_hash_set_string.cmi : ext/ordered_hash_set_gen.cmx
101+
ext/ordered_hash_set_ident.cmi : ext/ordered_hash_set_gen.cmx
96102
ext/union_find.cmi :
97-
ext/ext_ident.cmi :
98103
ext/ident_map.cmi : ext/map_gen.cmx
99104
ext/ident_set.cmi : ext/set_gen.cmx
100105
ext/hashtbl_make.cmi : ext/hashtbl_gen.cmx
@@ -268,7 +273,8 @@ core/lam_stats_util.cmi : core/lam_stats.cmi core/lam.cmi
268273
core/lam_stats_export.cmi : core/lam_stats.cmi core/lam_module_ident.cmi \
269274
core/lam.cmi core/js_cmj_format.cmi ext/ident_map.cmi
270275
core/lam_pass_alpha_conversion.cmi : core/lam_stats.cmi core/lam.cmi
271-
core/lam_pass_collect.cmi : core/lam_stats.cmi core/lam.cmi
276+
core/lam_pass_collect.cmi : core/lam_stats.cmi core/lam.cmi \
277+
ext/ident_set.cmi
272278
core/js_program_loader.cmi : core/lam_module_ident.cmi core/j.cmx
273279
core/js_dump.cmi : core/lam_module_ident.cmi core/j.cmx ext/ext_pp.cmi
274280
core/js_pass_debug.cmi : core/j.cmx
@@ -285,6 +291,7 @@ core/lam_compile_primitive.cmi : core/lam_compile_defs.cmi core/lam.cmi \
285291
core/lam_compile.cmi : core/lam_compile_defs.cmi core/lam.cmi \
286292
core/js_output.cmi core/j.cmx
287293
core/lam_pass_exits.cmi : core/lam.cmi ext/int_hashtbl.cmi
294+
core/lam_pass_count.cmi : core/lam.cmi ext/ident_hashtbl.cmi
288295
core/lam_pass_lets_dce.cmi : core/lam.cmi
289296
core/lam_pass_remove_alias.cmi : core/lam_stats.cmi core/lam.cmi
290297
core/lam_compile_group.cmi : core/j.cmx
@@ -302,7 +309,8 @@ core/ocaml_parse.cmx : syntax/ppx_entry.cmx common/js_config.cmx \
302309
core/lam.cmx : ext/ordered_hash_map_local_ident.cmx \
303310
core/ocaml_stdlib_slots.cmx ext/literals.cmx common/js_config.cmx \
304311
ext/int_vec_vec.cmx ext/int_vec.cmx ext/ident_set.cmx \
305-
ext/ident_hash_set.cmx ext/ext_string.cmx ext/ext_scc.cmx core/lam.cmi
312+
ext/ident_hashtbl.cmx ext/ident_hash_set.cmx ext/ext_string.cmx \
313+
ext/ext_scc.cmx core/lam.cmi
306314
core/lam_print.cmx : core/lam.cmx core/lam_print.cmi
307315
core/lam_beta_reduce_util.cmx : core/lam.cmx ext/ident_hashtbl.cmx \
308316
core/lam_beta_reduce_util.cmi
@@ -482,9 +490,13 @@ core/lam_compile.cmx : ext/literals.cmx core/lam_util.cmx \
482490
core/lam_pass_exits.cmx : core/lam_util.cmx core/lam_beta_reduce.cmx \
483491
core/lam_analysis.cmx core/lam.cmx ext/int_hashtbl.cmx ext/ident_map.cmx \
484492
core/lam_pass_exits.cmi
485-
core/lam_pass_lets_dce.cmx : core/lam_util.cmx core/lam_beta_reduce.cmx \
486-
core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx ext/ident_map.cmx \
487-
ext/ident_hashtbl.cmx ext/ext_list.cmx core/lam_pass_lets_dce.cmi
493+
core/lam_pass_count.cmx : core/lam_beta_reduce.cmx core/lam.cmx \
494+
ext/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
495+
core/lam_pass_count.cmi
496+
core/lam_pass_lets_dce.cmx : core/lam_util.cmx core/lam_pass_count.cmx \
497+
core/lam_beta_reduce.cmx core/lam_analysis.cmx core/lam.cmx \
498+
ext/ident_set.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
499+
core/lam_pass_lets_dce.cmi
488500
core/lam_pass_remove_alias.cmx : core/lam_util.cmx core/lam_stats.cmx \
489501
core/lam_module_ident.cmx core/lam_inline_util.cmx \
490502
core/lam_compile_env.cmx core/lam_closure.cmx core/lam_beta_reduce.cmx \

0 commit comments

Comments
 (0)