@@ -70,7 +70,8 @@ declare_args() {
7070
7171 # Enable embedded builtins.
7272 # TODO(jgruber,v8:6666): Support ia32 and maybe MSVC.
73- v8_enable_embedded_builtins = v8_current_cpu != " x86" && (! is_win || is_clang )
73+ # TODO(jgruber,v8:6666): Re-enable.
74+ v8_enable_embedded_builtins = false
7475
7576 # Enable code-generation-time checking of types in the CodeStubAssembler.
7677 v8_enable_verify_csa = false
@@ -841,6 +842,18 @@ action("postmortem-metadata") {
841842 rebase_path (sources , root_build_dir )
842843}
843844
845+ torque_files = [
846+ " src/builtins/base.tq" ,
847+ " src/builtins/array.tq" ,
848+ " src/builtins/typed-array.tq" ,
849+ ]
850+
851+ torque_modules = [
852+ " base" ,
853+ " array" ,
854+ " typed-array" ,
855+ ]
856+
844857action (" run_torque" ) {
845858 visibility = [
846859 " :*" ,
@@ -862,32 +875,61 @@ action("run_torque") {
862875
863876 script = " tools/run.py"
864877
865- inputs = [
866- " src/builtins/base.tq" ,
867- " src/builtins/array.tq" ,
868- " src/builtins/typed-array.tq" ,
869- ]
878+ sources = torque_files
870879
871880 outputs = [
872- " $target_gen_dir /builtin-definitions-from-dsl.h" ,
873- " $target_gen_dir /builtins-array-from-dsl-gen.cc" ,
874- " $target_gen_dir /builtins-array-from-dsl-gen.h" ,
875- " $target_gen_dir /builtins-base-from-dsl-gen.cc" ,
876- " $target_gen_dir /builtins-base-from-dsl-gen.h" ,
877- " $target_gen_dir /builtins-typed-array-from-dsl-gen.cc" ,
878- " $target_gen_dir /builtins-typed-array-from-dsl-gen.h" ,
881+ " $target_gen_dir /torque-generated/builtin-definitions-from-dsl.h" ,
879882 ]
883+ foreach (module , torque_modules ) {
884+ outputs += [
885+ " $target_gen_dir /torque-generated/builtins-$module -from-dsl-gen.cc" ,
886+ " $target_gen_dir /torque-generated/builtins-$module -from-dsl-gen.h" ,
887+ ]
888+ }
880889
881890 args = [
882891 " ./" + rebase_path (get_label_info (" :torque($v8_torque_toolchain )" ,
883892 " root_out_dir" ) + " /torque" ,
884893 root_build_dir ),
885894 " -o" ,
886- rebase_path (" $target_gen_dir " , root_build_dir ),
887- rebase_path (" src/builtins/base.tq" , root_build_dir ),
888- rebase_path (" src/builtins/array.tq" , root_build_dir ),
889- rebase_path (" src/builtins/typed-array.tq" , root_build_dir ),
895+ rebase_path (" $target_gen_dir /torque-generated" , root_build_dir ),
896+ ]
897+
898+ foreach (file , torque_files ) {
899+ args += [ rebase_path (file , root_build_dir ) ]
900+ }
901+ }
902+
903+ v8_source_set (" torque_generated_core" ) {
904+ visibility = [ " :*" ] # Only targets in this file can depend on this.
905+
906+ deps = [
907+ " :run_torque" ,
908+ ]
909+
910+ sources = [
911+ " $target_gen_dir /torque-generated/builtin-definitions-from-dsl.h" ,
912+ ]
913+
914+ configs = [ " :internal_config" ]
915+ }
916+
917+ v8_source_set (" torque_generated_initializers" ) {
918+ visibility = [ " :*" ] # Only targets in this file can depend on this.
919+
920+ deps = [
921+ " :run_torque" ,
890922 ]
923+
924+ sources = []
925+ foreach (module , torque_modules ) {
926+ sources += [
927+ " $target_gen_dir /torque-generated/builtins-$module -from-dsl-gen.cc" ,
928+ " $target_gen_dir /torque-generated/builtins-$module -from-dsl-gen.h" ,
929+ ]
930+ }
931+
932+ configs = [ " :internal_config" ]
891933}
892934
893935# Template to generate different V8 snapshots based on different runtime flags.
@@ -1199,15 +1241,11 @@ v8_source_set("v8_initializers") {
11991241 ]
12001242
12011243 deps = [
1202- " :run_torque " ,
1244+ " :torque_generated_initializers " ,
12031245 " :v8_base" ,
12041246 ]
12051247
12061248 sources = [
1207- " $target_gen_dir /builtins-array-from-dsl-gen.cc" ,
1208- " $target_gen_dir /builtins-base-from-dsl-gen.cc" ,
1209- " $target_gen_dir /builtins-typed-array-from-dsl-gen.cc" ,
1210-
12111249 # ## gcmole(all) ###
12121250 " src/builtins/builtins-arguments-gen.cc" ,
12131251 " src/builtins/builtins-arguments-gen.h" ,
@@ -1388,7 +1426,6 @@ v8_source_set("v8_base") {
13881426 split_count = 2
13891427
13901428 sources = [
1391- " $target_gen_dir /builtin-definitions-from-dsl.h" ,
13921429 " //base/trace_event/common/trace_event_common.h" ,
13931430
13941431 # ## gcmole(all) ###
@@ -1415,6 +1452,7 @@ v8_source_set("v8_base") {
14151452 " src/api.h" ,
14161453 " src/arguments.cc" ,
14171454 " src/arguments.h" ,
1455+ " src/asan.h" ,
14181456 " src/asmjs/asm-js.cc" ,
14191457 " src/asmjs/asm-js.h" ,
14201458 " src/asmjs/asm-names.h" ,
@@ -2698,7 +2736,7 @@ v8_source_set("v8_base") {
26982736
26992737 defines = []
27002738 deps = [
2701- " :run_torque " ,
2739+ " :torque_generated_core " ,
27022740 " :v8_headers" ,
27032741 " :v8_libbase" ,
27042742 " :v8_libsampler" ,
@@ -3449,7 +3487,7 @@ v8_source_set("wasm_module_runner") {
34493487 ]
34503488
34513489 deps = [
3452- " :run_torque " ,
3490+ " :torque_generated_core " ,
34533491 ]
34543492
34553493 configs = [
@@ -3526,7 +3564,7 @@ v8_source_set("lib_wasm_fuzzer_common") {
35263564 ]
35273565
35283566 deps = [
3529- " :run_torque " ,
3567+ " :torque_generated_core " ,
35303568 ]
35313569
35323570 configs = [
0 commit comments