Skip to content

Commit d266e3e

Browse files
committed
deps: sync V8 gypfiles with 7.2
Co-authored-by: Ujjwal Sharma <[email protected]> win: add v8_init to dependencies Fixes: nodejs/node-v8#89 Co-authored-by: Bartosz Sosnowski <[email protected]> PR-URL: #25852 Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Ali Ijaz Sheikh <[email protected]>
1 parent 9577f77 commit d266e3e

File tree

5 files changed

+205
-158
lines changed

5 files changed

+205
-158
lines changed

common.gypi

+3
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
# Still WIP in V8 7.1
7272
'v8_enable_pointer_compression': 'false',
7373

74+
# Explicitly set to false to copy V8's default
75+
'v8_enable_31bit_smis_on_64bit_arch': 'false',
76+
7477
# New in V8 7.1
7578
'v8_enable_embedded_builtins': 'true',
7679

deps/v8/gypfiles/d8.gyp

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
'../src/async-hooks-wrapper.h',
3232
'../src/d8-console.cc',
3333
'../src/d8-console.h',
34+
'../src/d8-platforms.cc',
35+
'../src/d8-platforms.h',
3436
'../src/d8.cc',
3537
'../src/d8.h',
3638
],

deps/v8/gypfiles/features.gypi

+24-5
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,21 @@
5151

5252
'v8_enable_gdbjit%': 0,
5353

54+
# Build-time flag for enabling nojit mode.
55+
# TODO(v8:7777): Remove the build-time flag once the --jitless runtime flag
56+
# does everything we need.
57+
'v8_enable_jitless_mode%': 0,
58+
59+
# Enable code-generation-time checking of types in the CodeStubAssembler.
5460
'v8_enable_verify_csa%': 0,
5561

5662
'v8_object_print%': 0,
5763

64+
# Lite mode disables a number of performance optimizations to reduce memory
65+
# at the cost of performance.
66+
# Sets --DV8_LITE_MODE.
67+
'v8_enable_lite_mode%': 0,
68+
5869
'v8_enable_verify_heap%': 0,
5970

6071
'v8_trace_maps%': 0,
@@ -111,17 +122,17 @@
111122

112123
'v8_enable_pointer_compression%': 'false',
113124

114-
'v8_enable_embedded_builtins%': 'true',
125+
'v8_enable_31bit_smis_on_64bit_arch%': 'false',
115126

116-
'v8_perf_prof_unwinding_info%': 0,
127+
'v8_enable_embedded_builtins%': 'true',
117128

118129
'v8_enable_fast_mksnapshot%': 0,
119130
},
120131

121132
'conditions': [
122133
# V8's predicate inverted since we default to 'true' and set 'false' for unsupported cases.
123-
# v8_use_snapshot && v8_current_cpu != "x86" && !is_aix && ( !is_win || is_clang)
124-
['not (v8_use_snapshot=="true" and v8_target_arch !="ia32" and OS!="aix" and (OS!="win" or clang==1))', {
134+
# !is_aix
135+
['not (OS!="aix")', {
125136
'variables': {
126137
'v8_enable_embedded_builtins': 'false',
127138
}
@@ -138,6 +149,9 @@
138149
['v8_promise_internal_field_count!=0', {
139150
'defines': ['V8_PROMISE_INTERNAL_FIELD_COUNT=<(v8_promise_internal_field_count)'],
140151
}],
152+
['v8_enable_lite_mode==1', {
153+
'defines': ['V8_LITE_MODE',],
154+
}],
141155
['v8_enable_gdbjit==1', {
142156
'defines': ['ENABLE_GDB_JIT_INTERFACE',],
143157
}],
@@ -200,12 +214,17 @@
200214
['v8_enable_pointer_compression=="true"', {
201215
'defines': ['V8_COMPRESS_POINTERS',],
202216
}],
217+
['v8_enable_31bit_smis_on_64bit_arch=="true"', {
218+
'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH',],
219+
}],
203220
['v8_enable_embedded_builtins=="true"', {
204221
'defines': [
205222
'V8_EMBEDDED_BUILTINS',
206-
'V8_EMBEDDED_BYTECODE_HANDLERS',
207223
],
208224
}],
225+
['v8_enable_jitless_mode==1', {
226+
'defines': ['V8_JITLESS_MODE',],
227+
}],
209228
], # conditions
210229
'defines': [
211230
'V8_GYP_BUILD',

deps/v8/gypfiles/inspector.gypi

+5-28
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@
2828
'<(SHARED_INTERMEDIATE_DIR)/include/inspector/Schema.h',
2929
],
3030

31-
'inspector_injected_script_source': '../src/inspector/injected-script-source.js',
32-
'inspector_generated_injected_script': '<(SHARED_INTERMEDIATE_DIR)/src/inspector/injected-script-source.h',
33-
3431
'inspector_all_sources': [
3532
'../include/v8-inspector.h',
3633
'../include/v8-inspector-protocol.h',
34+
'../src/inspector/custom-preview.cc',
35+
'../src/inspector/custom-preview.h',
3736
'../src/inspector/injected-script.cc',
3837
'../src/inspector/injected-script.h',
3938
'../src/inspector/inspected-context.cc',
@@ -60,18 +59,12 @@
6059
'../src/inspector/v8-debugger-agent-impl.h',
6160
'../src/inspector/v8-debugger-script.cc',
6261
'../src/inspector/v8-debugger-script.h',
63-
'../src/inspector/v8-function-call.cc',
64-
'../src/inspector/v8-function-call.h',
6562
'../src/inspector/v8-heap-profiler-agent-impl.cc',
6663
'../src/inspector/v8-heap-profiler-agent-impl.h',
67-
'../src/inspector/v8-injected-script-host.cc',
68-
'../src/inspector/v8-injected-script-host.h',
6964
'../src/inspector/v8-inspector-impl.cc',
7065
'../src/inspector/v8-inspector-impl.h',
7166
'../src/inspector/v8-inspector-session-impl.cc',
7267
'../src/inspector/v8-inspector-session-impl.h',
73-
'../src/inspector/v8-internal-value-type.cc',
74-
'../src/inspector/v8-internal-value-type.h',
7568
'../src/inspector/v8-profiler-agent-impl.cc',
7669
'../src/inspector/v8-profiler-agent-impl.h',
7770
'../src/inspector/v8-regex.cc',
@@ -84,6 +77,8 @@
8477
'../src/inspector/v8-stack-trace-impl.h',
8578
'../src/inspector/v8-value-utils.cc',
8679
'../src/inspector/v8-value-utils.h',
80+
'../src/inspector/value-mirror.cc',
81+
'../src/inspector/value-mirror.h',
8782
'../src/inspector/wasm-translation.cc',
8883
'../src/inspector/wasm-translation.h',
8984
]
@@ -102,7 +97,7 @@
10297
],
10398
'action': [
10499
'python',
105-
'<(protocol_path)/CheckProtocolCompatibility.py',
100+
'<(protocol_path)/check_protocol_compatibility.py',
106101
'--stamp', '<@(_outputs)',
107102
'<(inspector_path)/js_protocol.json',
108103
],
@@ -128,23 +123,5 @@
128123
],
129124
'message': 'Generating inspector protocol sources from protocol json',
130125
},
131-
{
132-
'action_name': 'convert_js_to_cpp_char_array',
133-
'inputs': [
134-
'<(inspector_path)/build/xxd.py',
135-
'<(inspector_injected_script_source)',
136-
],
137-
'outputs': [
138-
'<(inspector_generated_injected_script)',
139-
],
140-
'process_outputs_as_sources': 1,
141-
'action': [
142-
'python',
143-
'<(inspector_path)/build/xxd.py',
144-
'InjectedScriptSource_js',
145-
'<(inspector_path)/injected-script-source.js',
146-
'<@(_outputs)'
147-
],
148-
},
149126
],
150127
}

0 commit comments

Comments
 (0)