Skip to content

Commit

Permalink
deps: sync V8 gypfiles with 7.2
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
targos committed Mar 14, 2019
1 parent 9577f77 commit d266e3e
Show file tree
Hide file tree
Showing 5 changed files with 205 additions and 158 deletions.
3 changes: 3 additions & 0 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
# Still WIP in V8 7.1
'v8_enable_pointer_compression': 'false',

# Explicitly set to false to copy V8's default
'v8_enable_31bit_smis_on_64bit_arch': 'false',

# New in V8 7.1
'v8_enable_embedded_builtins': 'true',

Expand Down
2 changes: 2 additions & 0 deletions deps/v8/gypfiles/d8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
'../src/async-hooks-wrapper.h',
'../src/d8-console.cc',
'../src/d8-console.h',
'../src/d8-platforms.cc',
'../src/d8-platforms.h',
'../src/d8.cc',
'../src/d8.h',
],
Expand Down
29 changes: 24 additions & 5 deletions deps/v8/gypfiles/features.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,21 @@

'v8_enable_gdbjit%': 0,

# Build-time flag for enabling nojit mode.
# TODO(v8:7777): Remove the build-time flag once the --jitless runtime flag
# does everything we need.
'v8_enable_jitless_mode%': 0,

# Enable code-generation-time checking of types in the CodeStubAssembler.
'v8_enable_verify_csa%': 0,

'v8_object_print%': 0,

# Lite mode disables a number of performance optimizations to reduce memory
# at the cost of performance.
# Sets --DV8_LITE_MODE.
'v8_enable_lite_mode%': 0,

'v8_enable_verify_heap%': 0,

'v8_trace_maps%': 0,
Expand Down Expand Up @@ -111,17 +122,17 @@

'v8_enable_pointer_compression%': 'false',

'v8_enable_embedded_builtins%': 'true',
'v8_enable_31bit_smis_on_64bit_arch%': 'false',

'v8_perf_prof_unwinding_info%': 0,
'v8_enable_embedded_builtins%': 'true',

'v8_enable_fast_mksnapshot%': 0,
},

'conditions': [
# V8's predicate inverted since we default to 'true' and set 'false' for unsupported cases.
# v8_use_snapshot && v8_current_cpu != "x86" && !is_aix && ( !is_win || is_clang)
['not (v8_use_snapshot=="true" and v8_target_arch !="ia32" and OS!="aix" and (OS!="win" or clang==1))', {
# !is_aix
['not (OS!="aix")', {
'variables': {
'v8_enable_embedded_builtins': 'false',
}
Expand All @@ -138,6 +149,9 @@
['v8_promise_internal_field_count!=0', {
'defines': ['V8_PROMISE_INTERNAL_FIELD_COUNT=<(v8_promise_internal_field_count)'],
}],
['v8_enable_lite_mode==1', {
'defines': ['V8_LITE_MODE',],
}],
['v8_enable_gdbjit==1', {
'defines': ['ENABLE_GDB_JIT_INTERFACE',],
}],
Expand Down Expand Up @@ -200,12 +214,17 @@
['v8_enable_pointer_compression=="true"', {
'defines': ['V8_COMPRESS_POINTERS',],
}],
['v8_enable_31bit_smis_on_64bit_arch=="true"', {
'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH',],
}],
['v8_enable_embedded_builtins=="true"', {
'defines': [
'V8_EMBEDDED_BUILTINS',
'V8_EMBEDDED_BYTECODE_HANDLERS',
],
}],
['v8_enable_jitless_mode==1', {
'defines': ['V8_JITLESS_MODE',],
}],
], # conditions
'defines': [
'V8_GYP_BUILD',
Expand Down
33 changes: 5 additions & 28 deletions deps/v8/gypfiles/inspector.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@
'<(SHARED_INTERMEDIATE_DIR)/include/inspector/Schema.h',
],

'inspector_injected_script_source': '../src/inspector/injected-script-source.js',
'inspector_generated_injected_script': '<(SHARED_INTERMEDIATE_DIR)/src/inspector/injected-script-source.h',

'inspector_all_sources': [
'../include/v8-inspector.h',
'../include/v8-inspector-protocol.h',
'../src/inspector/custom-preview.cc',
'../src/inspector/custom-preview.h',
'../src/inspector/injected-script.cc',
'../src/inspector/injected-script.h',
'../src/inspector/inspected-context.cc',
Expand All @@ -60,18 +59,12 @@
'../src/inspector/v8-debugger-agent-impl.h',
'../src/inspector/v8-debugger-script.cc',
'../src/inspector/v8-debugger-script.h',
'../src/inspector/v8-function-call.cc',
'../src/inspector/v8-function-call.h',
'../src/inspector/v8-heap-profiler-agent-impl.cc',
'../src/inspector/v8-heap-profiler-agent-impl.h',
'../src/inspector/v8-injected-script-host.cc',
'../src/inspector/v8-injected-script-host.h',
'../src/inspector/v8-inspector-impl.cc',
'../src/inspector/v8-inspector-impl.h',
'../src/inspector/v8-inspector-session-impl.cc',
'../src/inspector/v8-inspector-session-impl.h',
'../src/inspector/v8-internal-value-type.cc',
'../src/inspector/v8-internal-value-type.h',
'../src/inspector/v8-profiler-agent-impl.cc',
'../src/inspector/v8-profiler-agent-impl.h',
'../src/inspector/v8-regex.cc',
Expand All @@ -84,6 +77,8 @@
'../src/inspector/v8-stack-trace-impl.h',
'../src/inspector/v8-value-utils.cc',
'../src/inspector/v8-value-utils.h',
'../src/inspector/value-mirror.cc',
'../src/inspector/value-mirror.h',
'../src/inspector/wasm-translation.cc',
'../src/inspector/wasm-translation.h',
]
Expand All @@ -102,7 +97,7 @@
],
'action': [
'python',
'<(protocol_path)/CheckProtocolCompatibility.py',
'<(protocol_path)/check_protocol_compatibility.py',
'--stamp', '<@(_outputs)',
'<(inspector_path)/js_protocol.json',
],
Expand All @@ -128,23 +123,5 @@
],
'message': 'Generating inspector protocol sources from protocol json',
},
{
'action_name': 'convert_js_to_cpp_char_array',
'inputs': [
'<(inspector_path)/build/xxd.py',
'<(inspector_injected_script_source)',
],
'outputs': [
'<(inspector_generated_injected_script)',
],
'process_outputs_as_sources': 1,
'action': [
'python',
'<(inspector_path)/build/xxd.py',
'InjectedScriptSource_js',
'<(inspector_path)/injected-script-source.js',
'<@(_outputs)'
],
},
],
}
Loading

0 comments on commit d266e3e

Please sign in to comment.