Skip to content

Commit 027dcff

Browse files
targostargos
committedSep 19, 2019
tools: sync gypfiles with V8 7.7
Co-authored-by: Ujjwal Sharma <[email protected]> Backport-PR-URL: #29241 PR-URL: #28918 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Rich Trott <[email protected]>
·
v12.22.12v12.11.0
1 parent 60efc5f commit 027dcff

File tree

5 files changed

+58
-76
lines changed

5 files changed

+58
-76
lines changed
 

‎src/inspector/node_inspector.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
{
114114
'action_name': 'concatenate_protocols',
115115
'inputs': [
116-
'../../deps/v8/src/inspector/js_protocol.pdl',
116+
'../../deps/v8/include/js_protocol.pdl',
117117
'<(SHARED_INTERMEDIATE_DIR)/src/node_protocol.json',
118118
],
119119
'outputs': [

‎tools/v8_gypfiles/ForEachReplace.py

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright (c) 2019 Ujjwal Sharma <usharma1998@gmail>. All rights reserved.
2+
# Use of this source code is governed by an MIT-style license.
3+
4+
def DoMain(args):
5+
old = args.pop(0)
6+
new = args.pop(0)
7+
return ' '.join(a.replace(old, new) for a in args)

‎tools/v8_gypfiles/features.gypi

+1
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@
253253
'defines': [
254254
'V8_ENABLE_ALLOCATION_TIMEOUT',
255255
'V8_ENABLE_FORCE_SLOW_PATH',
256+
'V8_ENABLE_DOUBLE_CONST_STORE_CHECK',
256257
],
257258
}],
258259
['v8_enable_v8_checks==1', {

‎tools/v8_gypfiles/inspector.gypi

+33-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,31 @@
33
# found in the LICENSE file.
44

55
{
6-
'includes': [
7-
'../../deps/v8/third_party/inspector_protocol/inspector_protocol.gypi',
8-
],
96
'variables': {
107
'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol',
8+
'inspector_protocol_files': [
9+
'<(inspector_protocol_path)/lib/base_string_adapter_cc.template',
10+
'<(inspector_protocol_path)/lib/base_string_adapter_h.template',
11+
'<(inspector_protocol_path)/lib/DispatcherBase_cpp.template',
12+
'<(inspector_protocol_path)/lib/DispatcherBase_h.template',
13+
'<(inspector_protocol_path)/lib/ErrorSupport_cpp.template',
14+
'<(inspector_protocol_path)/lib/ErrorSupport_h.template',
15+
'<(inspector_protocol_path)/lib/Forward_h.template',
16+
'<(inspector_protocol_path)/lib/FrontendChannel_h.template',
17+
'<(inspector_protocol_path)/lib/Object_cpp.template',
18+
'<(inspector_protocol_path)/lib/Object_h.template',
19+
'<(inspector_protocol_path)/lib/Parser_cpp.template',
20+
'<(inspector_protocol_path)/lib/Parser_h.template',
21+
'<(inspector_protocol_path)/lib/Protocol_cpp.template',
22+
'<(inspector_protocol_path)/lib/ValueConversions_h.template',
23+
'<(inspector_protocol_path)/lib/Values_cpp.template',
24+
'<(inspector_protocol_path)/lib/Values_h.template',
25+
'<(inspector_protocol_path)/templates/Exported_h.template',
26+
'<(inspector_protocol_path)/templates/Imported_h.template',
27+
'<(inspector_protocol_path)/templates/TypeBuilder_cpp.template',
28+
'<(inspector_protocol_path)/templates/TypeBuilder_h.template',
29+
'<(inspector_protocol_path)/code_generator.py',
30+
],
1131
'inspector_path': '<(V8_ROOT)/src/inspector',
1232
'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root',
1333
'inspector_generated_sources': [
@@ -92,16 +112,22 @@
92112
# Flat merge `third_party/inspector_protocol:encoding`
93113
'<(inspector_protocol_path)/encoding/encoding.cc',
94114
'<(inspector_protocol_path)/encoding/encoding.h',
95-
]
115+
# Flat merge `third_party/inspector_protocol:bindings`
116+
'<(inspector_protocol_path)/bindings/bindings.cc',
117+
'<(inspector_protocol_path)/bindings/bindings.h',
118+
119+
],
120+
'v8_inspector_js_protocol': '<(V8_ROOT)/include/js_protocol.pdl',
96121
},
97122
'include_dirs': [
98123
'<(inspector_generated_output_root)',
124+
'<(inspector_protocol_path)',
99125
],
100126
'actions': [
101127
{
102128
'action_name': 'protocol_compatibility',
103129
'inputs': [
104-
'<(inspector_path)/js_protocol.pdl',
130+
'<(v8_inspector_js_protocol)',
105131
],
106132
'outputs': [
107133
'<@(inspector_generated_output_root)/src/js_protocol.stamp',
@@ -117,7 +143,7 @@
117143
{
118144
'action_name': 'protocol_generated_sources',
119145
'inputs': [
120-
'<(inspector_path)/js_protocol.pdl',
146+
'<(v8_inspector_js_protocol)',
121147
'<(inspector_path)/inspector_protocol_config.json',
122148
'<@(inspector_protocol_files)',
123149
],
@@ -131,6 +157,7 @@
131157
'--jinja_dir', '<(V8_ROOT)/third_party',
132158
'--output_base', '<(inspector_generated_output_root)/src/inspector',
133159
'--config', '<(inspector_path)/inspector_protocol_config.json',
160+
'--inspector_protocol_dir', '<(inspector_protocol_path)',
134161
],
135162
'message': 'Generating inspector protocol sources from protocol json',
136163
},

‎tools/v8_gypfiles/v8.gyp

+16-69
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"<(V8_ROOT)/src/builtins/array-unshift.tq",
3535
"<(V8_ROOT)/src/builtins/array.tq",
3636
"<(V8_ROOT)/src/builtins/base.tq",
37+
"<(V8_ROOT)/src/builtins/bigint.tq",
3738
"<(V8_ROOT)/src/builtins/boolean.tq",
3839
"<(V8_ROOT)/src/builtins/collections.tq",
3940
"<(V8_ROOT)/src/builtins/data-view.tq",
@@ -44,13 +45,20 @@
4445
"<(V8_ROOT)/src/builtins/iterator.tq",
4546
"<(V8_ROOT)/src/builtins/math.tq",
4647
"<(V8_ROOT)/src/builtins/object-fromentries.tq",
48+
"<(V8_ROOT)/src/builtins/object.tq",
4749
"<(V8_ROOT)/src/builtins/proxy-constructor.tq",
50+
"<(V8_ROOT)/src/builtins/proxy-delete-property.tq",
4851
"<(V8_ROOT)/src/builtins/proxy-get-property.tq",
52+
"<(V8_ROOT)/src/builtins/proxy-get-prototype-of.tq",
4953
"<(V8_ROOT)/src/builtins/proxy-has-property.tq",
54+
"<(V8_ROOT)/src/builtins/proxy-is-extensible.tq",
55+
"<(V8_ROOT)/src/builtins/proxy-prevent-extensions.tq",
5056
"<(V8_ROOT)/src/builtins/proxy-revocable.tq",
5157
"<(V8_ROOT)/src/builtins/proxy-revoke.tq",
5258
"<(V8_ROOT)/src/builtins/proxy-set-property.tq",
59+
"<(V8_ROOT)/src/builtins/proxy-set-prototype-of.tq",
5360
"<(V8_ROOT)/src/builtins/proxy.tq",
61+
"<(V8_ROOT)/src/builtins/reflect.tq",
5462
"<(V8_ROOT)/src/builtins/regexp-replace.tq",
5563
"<(V8_ROOT)/src/builtins/regexp.tq",
5664
"<(V8_ROOT)/src/builtins/string.tq",
@@ -74,66 +82,12 @@
7482
"<(V8_ROOT)/src/builtins/typed-array-subarray.tq",
7583
"<(V8_ROOT)/src/builtins/typed-array.tq",
7684
"<(V8_ROOT)/third_party/v8/builtins/array-sort.tq",
77-
],
78-
'torque_namespaces': [
79-
"arguments",
80-
"array",
81-
"array-copywithin",
82-
"array-filter",
83-
"array-find",
84-
"array-findindex",
85-
"array-foreach",
86-
"array-join",
87-
"array-map",
88-
"array-of",
89-
"array-reverse",
90-
"array-shift",
91-
"array-slice",
92-
"array-splice",
93-
"array-unshift",
94-
"array-lastindexof",
95-
"base",
96-
"boolean",
97-
"collections",
98-
"data-view",
99-
"extras-utils",
100-
"growable-fixed-array",
101-
"internal-coverage",
102-
"iterator",
103-
"math",
104-
"object",
105-
"proxy",
106-
"regexp",
107-
"regexp-replace",
108-
"string",
109-
"string-html",
110-
"string-iterator",
111-
"string-repeat",
112-
"string-slice",
113-
"string-substring",
114-
"typed-array",
115-
"typed-array-createtypedarray",
116-
"typed-array-every",
117-
"typed-array-filter",
118-
"typed-array-find",
119-
"typed-array-findindex",
120-
"typed-array-foreach",
121-
"typed-array-reduce",
122-
"typed-array-reduceright",
123-
"typed-array-slice",
124-
"typed-array-some",
125-
"typed-array-subarray",
85+
"<(V8_ROOT)/test/torque/test-torque.tq",
12686
],
12787
'torque_output_root': '<(SHARED_INTERMEDIATE_DIR)/torque-output-root',
128-
# Since there is no foreach in GYP we use `ForEachFormat` to unroll the following:
129-
# foreach(namespace, torque_namespaces) {
130-
# outputs += [
131-
# "$target_gen_dir/torque-generated/builtins-$namespace-gen-tq.cc",
132-
# "$target_gen_dir/torque-generated/builtins-$namespace-gen-tq.h",
133-
# ]
134-
# }
135-
'torque_outputs': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/builtins-%s-gen-tq.cc" <@(torque_namespaces))'],
136-
'torque_outputs+': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/builtins-%s-gen-tq.h" <@(torque_namespaces))'],
88+
'torque_files_replaced': ['<!@pymod_do_main(ForEachReplace ".tq" "-tq-csa" <@(torque_files))'],
89+
'torque_outputs': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/%s.cc" <@(torque_files_replaced))'],
90+
'torque_outputs+': ['<!@pymod_do_main(ForEachFormat "<(torque_output_root)/torque-generated/%s.h" <@(torque_files_replaced))'],
13791
'v8_compiler_sources': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")'],
13892

13993
'conditions': [
@@ -182,11 +136,13 @@
182136
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.cc',
183137
'<(torque_output_root)/torque-generated/exported-macros-assembler-tq.h',
184138
'<(torque_output_root)/torque-generated/csa-types-tq.h',
139+
'<(torque_output_root)/torque-generated/instance-types-tq.h',
185140
'<@(torque_outputs)',
186141
],
187142
'action': [
188143
'<@(_inputs)',
189-
'-o', '<(torque_output_root)/torque-generated'
144+
'-o', '<(torque_output_root)/torque-generated',
145+
'-v8-root', '<(V8_ROOT)'
190146
],
191147
},
192148
],
@@ -1237,16 +1193,7 @@
12371193
'sources': [
12381194
'<(V8_ROOT)/src/libplatform/tracing/json-trace-event-listener.cc',
12391195
'<(V8_ROOT)/src/libplatform/tracing/json-trace-event-listener.h',
1240-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-consumer.cc',
1241-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-consumer.h',
1242-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-producer.cc',
1243-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-producer.h',
1244-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-shared-memory.cc',
1245-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-shared-memory.h',
1246-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-tasks.cc',
1247-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-tasks.h',
1248-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-tracing-controller.cc',
1249-
'<(V8_ROOT)/src/libplatform/tracing/perfetto-tracing-controller.h',
1196+
'<(V8_ROOT)/src/libplatform/tracing/trace-event-listener.cc',
12501197
'<(V8_ROOT)/src/libplatform/tracing/trace-event-listener.h',
12511198
],
12521199
'dependencies': [

0 commit comments

Comments
 (0)
Please sign in to comment.