From cc75ba3f140c4584a776c163a365fedd4ea5ef63 Mon Sep 17 00:00:00 2001 From: Ujjwal Sharma Date: Sat, 26 Jan 2019 00:33:36 +0530 Subject: [PATCH] deps: sync V8 gypfiles with 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Normalized boolean options in the gypfiles for consistency both internally and with the V8 GN config. Co-authored-by: Michaël Zasso PR-URL: https://github.com/nodejs/node/pull/26685 Reviewed-By: Anna Henningsen Reviewed-By: Michaël Zasso Reviewed-By: Refael Ackermann --- common.gypi | 17 +- configure.py | 4 +- deps/v8/gypfiles/d8.gyp | 2 +- deps/v8/gypfiles/features.gypi | 215 +++++++++++++-------- deps/v8/gypfiles/standalone.gypi | 2 +- deps/v8/gypfiles/v8.gyp | 151 +++++++++++++-- deps/v8/gypfiles/v8_external_snapshot.gypi | 2 +- doc/api/process.md | 2 +- node.gyp | 4 +- node.gypi | 2 +- src/inspector/node_inspector.gypi | 2 +- 11 files changed, 277 insertions(+), 126 deletions(-) diff --git a/common.gypi b/common.gypi index 3b99d4a36e91d4..787fc243c3b323 100644 --- a/common.gypi +++ b/common.gypi @@ -42,7 +42,7 @@ ##### V8 defaults for Node.js ##### # Old time default, now explicitly stated. - 'v8_use_snapshot': 'true', + 'v8_use_snapshot': 1, # Turn on SipHash for hash seed generation, addresses HashWick 'v8_use_siphash': 'true', @@ -58,21 +58,12 @@ # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, - # Don't bake anything extra into the snapshot. - 'v8_use_external_startup_data': 0, - # https://github.com/nodejs/node/pull/22920/files#r222779926 'v8_enable_handle_zapping': 0, # Disable V8 untrusted code mitigations. # See https://github.com/v8/v8/wiki/Untrusted-code-mitigations - 'v8_untrusted_code_mitigations': 'false', - - # Still WIP in V8 7.1 - 'v8_enable_pointer_compression': 'false', - - # New in V8 7.1 - 'v8_enable_embedded_builtins': 'true', + 'v8_untrusted_code_mitigations': 0, # This is more of a V8 dev setting # https://github.com/nodejs/node/pull/22920/files#r222779926 @@ -102,12 +93,12 @@ }], ['OS == "win"', { 'os_posix': 0, - 'v8_postmortem_support%': 'false', + 'v8_postmortem_support%': 0, 'obj_dir': '<(PRODUCT_DIR)/obj', 'v8_base': '<(PRODUCT_DIR)/lib/v8_libbase.lib', }, { 'os_posix': 1, - 'v8_postmortem_support%': 'true', + 'v8_postmortem_support%': 1, }], ['OS == "mac"', { 'obj_dir%': '<(PRODUCT_DIR)/obj.target', diff --git a/configure.py b/configure.py index 9539c1760c4909..6d184f56555e30 100755 --- a/configure.py +++ b/configure.py @@ -1124,8 +1124,8 @@ def configure_v8(o): o['variables']['v8_optimized_debug'] = 0 if options.v8_non_optimized_debug else 1 o['variables']['v8_random_seed'] = 0 # Use a random seed for hash tables. o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks. - o['variables']['v8_use_snapshot'] = 'false' if options.without_snapshot else 'true' - o['variables']['v8_use_siphash'] = 'false' if options.without_siphash else 'true' + o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1 + o['variables']['v8_use_snapshot'] = 0 if options.without_snapshot else 1 o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0 o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform) o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8) diff --git a/deps/v8/gypfiles/d8.gyp b/deps/v8/gypfiles/d8.gyp index 7870b6741fcb0a..a5fc10113fac68 100644 --- a/deps/v8/gypfiles/d8.gyp +++ b/deps/v8/gypfiles/d8.gyp @@ -53,7 +53,7 @@ }], [ 'component!="shared_library"', { 'conditions': [ - [ 'v8_postmortem_support=="true"', { + [ 'v8_postmortem_support==1', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-force_load,<(PRODUCT_DIR)/libv8_base.a' diff --git a/deps/v8/gypfiles/features.gypi b/deps/v8/gypfiles/features.gypi index 485a135aa1a5e9..8968629ddafd2d 100644 --- a/deps/v8/gypfiles/features.gypi +++ b/deps/v8/gypfiles/features.gypi @@ -42,91 +42,121 @@ }], ], - # Allows the embedder to add a custom suffix to the version string. - 'v8_embedder_string%': '', - - 'v8_enable_disassembler%': 0, - - 'v8_promise_internal_field_count%': 0, - - 'v8_enable_gdbjit%': 0, + # Variables from BUILD.gn - # Enable code-generation-time checking of types in the CodeStubAssembler. - 'v8_enable_verify_csa%': 0, + # Set to 1 to enable DCHECKs in release builds. + 'dcheck_always_on%': 0, - 'v8_object_print%': 0, + # Sets -DV8_ENABLE_FUTURE. + 'v8_enable_future%': 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, + # Sets -DVERIFY_HEAP. 'v8_enable_verify_heap%': 0, - 'v8_trace_maps%': 0, + # Sets -DVERIFY_PREDICTABLE + 'v8_enable_verify_predictable%': 0, - # Enable the snapshot feature, for fast context creation. - # http://v8project.blogspot.com/2015/09/custom-startup-snapshots.html - 'v8_use_snapshot%': 'true', + # Enable compiler warnings when using V8_DEPRECATED apis. + 'v8_deprecation_warnings%': 0, - 'v8_enable_verify_predictable%': 0, + # Enable compiler warnings when using V8_DEPRECATE_SOON apis. + 'v8_imminent_deprecation_warnings%': 0, - # With post mortem support enabled, metadata is embedded into libv8 that - # describes various parameters of the VM for use by debuggers. See - # tools/gen-postmortem-metadata.py for details. - 'v8_postmortem_support%': 'false', + # Allows the embedder to add a custom suffix to the version string. + 'v8_embedder_string%': '', - # Use Siphash as added protection against hash flooding attacks. - 'v8_use_siphash%': 'false', + # Sets -dENABLE_DISASSEMBLER. + 'v8_enable_disassembler%': 0, - # Interpreted regexp engine exists as platform-independent alternative - # based where the regular expression is compiled to a bytecode. - 'v8_interpreted_regexp%': 0, + # Sets the number of internal fields on promise objects. + 'v8_promise_internal_field_count%': 0, - # Enable ECMAScript Internationalization API. Enabling this feature will - # add a dependency on the ICU library. - 'v8_enable_i18n_support%': 1, + # Sets -dENABLE_GDB_JIT_INTERFACE. + 'v8_enable_gdbjit%': 0, - # Enable compiler warnings when using V8_DEPRECATED apis. - 'v8_deprecation_warnings%': 0, + # Sets -dENABLE_VTUNE_JIT_INTERFACE. + 'v8_enable_vtunejit%': 0, - # Enable compiler warnings when using V8_DEPRECATE_SOON apis. - 'v8_imminent_deprecation_warnings%': 0, + # Currently set for node by common.gypi, avoiding default because of gyp file bug. + # Should be turned on only for debugging. + #'v8_enable_handle_zapping%': 0, - # Set to 1 to enable DCHECKs in release builds. - 'dcheck_always_on%': 0, + # Enable fast mksnapshot runs. + 'v8_enable_fast_mksnapshot%': 0, - # Enable/disable JavaScript API accessors. - 'v8_js_accessors%': 0, + # Enable embedded builtins. + 'v8_enable_embedded_builtins%': 1, - # Temporary flag to allow embedders to update their microtasks scopes. - 'v8_check_microtasks_scopes_consistency%': 'false', + # Enable code comments for builtins in the snapshot (impacts performance). + 'v8_enable_snapshot_code_comments%': 0, - # Enable concurrent marking. + # Enable code-generation-time checking of types in the CodeStubAssembler. + 'v8_enable_verify_csa%': 0, + + # Enable pointer compression (sets -dV8_COMPRESS_POINTERS). + 'v8_enable_pointer_compression%': 0, + 'v8_enable_31bit_smis_on_64bit_arch%': 0, + + # Sets -dOBJECT_PRINT. + 'v8_enable_object_print%': 0, + + # Sets -dV8_TRACE_MAPS. + 'v8_enable_trace_maps%': 0, + + # Sets -dV8_ENABLE_CHECKS. + 'v8_enable_v8_checks%': 0, + + # Sets -dV8_TRACE_IGNITION. + 'v8_enable_trace_ignition%': 0, + + # Sets -dV8_TRACE_FEEDBACK_UPDATES. + 'v8_enable_trace_feedback_updates%': 0, + + # Sets -dV8_CONCURRENT_MARKING 'v8_enable_concurrent_marking%': 1, # Enables various testing features. 'v8_enable_test_features%': 0, + # With post mortem support enabled, metadata is embedded into libv8 that + # describes various parameters of the VM for use by debuggers. See + # tools/gen-postmortem-metadata.py for details. + 'v8_postmortem_support%': 0, + + # Use Siphash as added protection against hash flooding attacks. + 'v8_use_siphash%': 0, + # Controls the threshold for on-heap/off-heap Typed Arrays. 'v8_typed_array_max_size_in_heap%': 64, + # Temporary flag to allow embedders to update their microtasks scopes + # while rolling in a new version of V8. + 'v8_check_microtasks_scopes_consistency%': 0, + # Enable mitigations for executing untrusted code. - 'v8_untrusted_code_mitigations%': 'true', + 'v8_untrusted_code_mitigations%': 1, - # Currently set for node by common.gypi, avoiding default because of gyp file bug. - # Should be turned on only for debugging. - #'v8_enable_handle_zapping%': 0, + # Enable minor mark compact. + 'v8_enable_minor_mc%': 1, - 'v8_enable_pointer_compression%': 'false', - 'v8_enable_31bit_smis_on_64bit_arch%': 'false', + # Variables from v8.gni - 'v8_enable_embedded_builtins%': 'true', + # Enable the snapshot feature, for fast context creation. + # http://v8project.blogspot.com/2015/09/custom-startup-snapshots.html + 'v8_use_snapshot%': 1, - # Enable code comments for builtins in the snapshot (impacts performance). - 'v8_enable_snapshot_code_comments%': 'false', + # Use external files for startup data blobs: + # the JS builtins sources and the start snapshot. + 'v8_use_external_startup_data%': 0, - 'v8_enable_fast_mksnapshot%': 0, + # Enable ECMAScript Internationalization API. Enabling this feature will + # add a dependency on the ICU library. + 'v8_enable_i18n_support%': 1, }, 'target_defaults': { @@ -140,37 +170,56 @@ ['v8_promise_internal_field_count!=0', { 'defines': ['V8_PROMISE_INTERNAL_FIELD_COUNT=<(v8_promise_internal_field_count)'], }], + ['v8_enable_future==1', { + 'defines': ['V8_ENABLE_FUTURE',], + }], ['v8_enable_lite_mode==1', { 'defines': [ 'V8_LITE_MODE', - - # TODO(v8:7777): Remove the define once the --jitless runtime flag does everything we need. 'V8_JITLESS_MODE', ], }], ['v8_enable_gdbjit==1', { 'defines': ['ENABLE_GDB_JIT_INTERFACE',], }], - ['v8_enable_verify_csa==1', { - 'defines': ['ENABLE_VERIFY_CSA',], + ['v8_enable_vtunejit==1', { + 'defines': ['ENABLE_VTUNE_JIT_INTERFACE',], }], - ['v8_object_print==1', { + ['v8_enable_minor_mc==1', { + 'defines': ['ENABLE_MINOR_MC',], + }], + ['v8_enable_pointer_compression==1', { + 'defines': ['V8_COMPRESS_POINTERS',], + }], + ['v8_enable_pointer_compression==1 or v8_enable_31bit_smis_on_64bit_arch==1', { + 'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH',], + }], + ['v8_enable_object_print==1', { 'defines': ['OBJECT_PRINT',], }], ['v8_enable_verify_heap==1', { 'defines': ['VERIFY_HEAP',], }], - ['v8_trace_maps==1', { + ['v8_enable_verify_predictable==1', { + 'defines': ['VERIFY_PREDICTABLE',], + }], + ['v8_enable_trace_maps==1', { 'defines': ['V8_TRACE_MAPS',], }], - ['v8_enable_test_features==1', { - 'defines': ['V8_ENABLE_ALLOCATION_TIMEOUT', 'V8_ENABLE_FORCE_SLOW_PATH'], + ['v8_enable_trace_ignition==1', { + 'defines': ['V8_TRACE_IGNITION',], }], - ['v8_enable_verify_predictable==1', { - 'defines': ['VERIFY_PREDICTABLE',], + ['v8_enable_trace_feedback_updates==1', { + 'defines': ['V8_TRACE_FEEDBACK_UPDATES',], + }], + ['v8_enable_test_features==1', { + 'defines': [ + 'V8_ENABLE_ALLOCATION_TIMEOUT', + 'V8_ENABLE_FORCE_SLOW_PATH', + ], }], - ['v8_interpreted_regexp==1 or v8_enable_lite_mode==1', { - 'defines': ['V8_INTERPRETED_REGEXP',], + ['v8_enable_v8_checks==1', { + 'defines': ['V8_ENABLE_CHECKS',], }], ['v8_deprecation_warnings==1', { 'defines': ['V8_DEPRECATION_WARNINGS',], @@ -185,38 +234,36 @@ ['v8_enable_i18n_support==1', { 'defines': ['V8_INTL_SUPPORT',], }], - ['v8_use_snapshot=="true" and v8_use_external_startup_data==1', { - 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA',], + # Refs: https://github.com/nodejs/node/pull/23801 + # ['v8_enable_handle_zapping==1', { + # 'defines': ['ENABLE_HANDLE_ZAPPING',], + # }], + ['v8_use_snapshot==1', { + 'defines': ['V8_USE_SNAPSHOT',], }], - ['v8_use_siphash=="true"', { - 'defines': ['V8_USE_SIPHASH',], + ['v8_use_external_startup_data==1', { + 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA',], }], - ['dcheck_always_on!=0', { - 'defines': ['DEBUG',], + ['v8_enable_concurrent_marking==1', { + 'defines': ['V8_CONCURRENT_MARKING',], }], - ['v8_check_microtasks_scopes_consistency=="true"', { + ['v8_check_microtasks_scopes_consistency==1', { 'defines': ['V8_CHECK_MICROTASKS_SCOPES_CONSISTENCY',], }], - ['v8_enable_concurrent_marking==1', { - 'defines': ['V8_CONCURRENT_MARKING',], + ['v8_enable_embedded_builtins==1', { + 'defines': ['V8_EMBEDDED_BUILTINS',], }], - ['v8_untrusted_code_mitigations=="false"', { - 'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',], + ['v8_use_siphash==1', { + 'defines': ['V8_USE_SIPHASH',], }], - # Refs: https://github.com/nodejs/node/pull/23801 - # ['v8_enable_handle_zapping==1', { - # 'defines': ['ENABLE_HANDLE_ZAPPING',], - # }], - ['v8_enable_pointer_compression=="true"', { - 'defines': ['V8_COMPRESS_POINTERS',], + ['dcheck_always_on!=0', { + 'defines': ['DEBUG',], }], - ['v8_enable_31bit_smis_on_64bit_arch=="true"', { - 'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH',], + ['v8_enable_verify_csa==1', { + 'defines': ['ENABLE_VERIFY_CSA',], }], - ['v8_enable_embedded_builtins=="true"', { - 'defines': [ - 'V8_EMBEDDED_BUILTINS', - ], + ['v8_untrusted_code_mitigations==0', { + 'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',], }], ], # conditions 'defines': [ diff --git a/deps/v8/gypfiles/standalone.gypi b/deps/v8/gypfiles/standalone.gypi index 2b894b8c593afd..2a41237a608c39 100644 --- a/deps/v8/gypfiles/standalone.gypi +++ b/deps/v8/gypfiles/standalone.gypi @@ -43,7 +43,7 @@ 'v8_enable_i18n_support%': 1, 'v8_deprecation_warnings': 1, 'v8_imminent_deprecation_warnings': 1, - 'v8_check_microtasks_scopes_consistency': 'true', + 'v8_check_microtasks_scopes_consistency': 1, 'msvs_multi_core_compile%': '1', 'mac_deployment_target%': '10.7', 'release_extra_cflags%': '', diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index eb31d7087ea35c..6ab063c51a1afb 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -15,39 +15,77 @@ 'generate_bytecode_builtins_list_output' : '<(SHARED_INTERMEDIATE_DIR)/builtins-generated/bytecodes-builtins-list.h', 'torque_files': [ "../src/builtins/base.tq", + "../src/builtins/growable-fixed-array.tq", "../src/builtins/frames.tq", "../src/builtins/arguments.tq", "../src/builtins/array.tq", "../src/builtins/array-copywithin.tq", + "../src/builtins/array-every.tq", "../src/builtins/array-filter.tq", + "../src/builtins/array-find.tq", + "../src/builtins/array-findindex.tq", "../src/builtins/array-foreach.tq", "../src/builtins/array-join.tq", "../src/builtins/array-lastindexof.tq", "../src/builtins/array-of.tq", + "../src/builtins/array-map.tq", + "../src/builtins/array-reduce.tq", + "../src/builtins/array-reduce-right.tq", "../src/builtins/array-reverse.tq", "../src/builtins/array-slice.tq", + "../src/builtins/array-some.tq", "../src/builtins/array-splice.tq", "../src/builtins/array-unshift.tq", "../src/builtins/collections.tq", "../src/builtins/data-view.tq", "../src/builtins/extras-utils.tq", - "../src/builtins/object.tq", "../src/builtins/object-fromentries.tq", "../src/builtins/iterator.tq", + "../src/builtins/string-endswith.tq", + "../src/builtins/string-startswith.tq", "../src/builtins/typed-array.tq", "../src/builtins/typed-array-createtypedarray.tq", + "../src/builtins/typed-array-filter.tq", + "../src/builtins/typed-array-foreach.tq", + "../src/builtins/typed-array-reduce.tq", + "../src/builtins/typed-array-reduceright.tq", + "../src/builtins/typed-array-slice.tq", + "../src/builtins/typed-array-subarray.tq", "../third_party/v8/builtins/array-sort.tq", ], 'torque_namespaces': [ - "base", "arguments", "array", + "array-copywithin", + "array-every", + "array-filter", + "array-find", + "array-findindex", + "array-foreach", + "array-join", + "array-map", + "array-of", + "array-reverse", + "array-slice", + "array-splice", + "array-unshift", + "array-lastindexof", + "base", "collections", + "data-view", + "extras-utils", + "growable-fixed-array", "iterator", "object", + "string", "typed-array", - "data-view", - "extras-utils", + "typed-array-createtypedarray", + "typed-array-filter", + "typed-array-foreach", + "typed-array-reduce", + "typed-array-reduceright", + "typed-array-slice", + "typed-array-subarray", ], # Since there is no foreach in GYP we manualy unroll the following: # foreach(namespace, torque_namespaces) { @@ -57,27 +95,72 @@ # ] # } 'torque_outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.h', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-arguments-from-dsl-gen.cc', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-arguments-from-dsl-gen.h', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-from-dsl-gen.cc', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-copywithin-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-copywithin-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-filter-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-filter-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-find-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-find-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-findindex-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-findindex-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-foreach-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-foreach-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-join-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-join-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-map-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-map-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-of-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-of-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-reverse-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-reverse-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-slice-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-slice-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-splice-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-splice-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-unshift-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-unshift-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-lastindexof-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-lastindexof-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.h', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-collections-from-dsl-gen.cc', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-collections-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-extras-utils-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-extras-utils-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-growable-fixed-array-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-growable-fixed-array-from-dsl-gen.h', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-iterator-from-dsl-gen.cc', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-iterator-from-dsl-gen.h', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-object-from-dsl-gen.cc', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-object-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-string-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-string-from-dsl-gen.h', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc', '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-extras-utils-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-extras-utils-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-createtypedarray-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-createtypedarray-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-filter-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-filter-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-foreach-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-foreach-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-reduce-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-reduce-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-reduceright-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-reduceright-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-slice-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-slice-from-dsl-gen.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-subarray-from-dsl-gen.cc', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-subarray-from-dsl-gen.h', ], 'torque_generated_pure_headers': [ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtin-definitions-from-dsl.h', + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-definitions-from-dsl.h', ], }, 'includes': ['toolchain.gypi', 'features.gypi', 'v8_external_snapshot.gypi'], @@ -144,6 +227,7 @@ 'is_android=<(is_android)', 'is_asan=<(asan)', 'is_cfi=<(cfi_vptr)', + 'is_clang=<(clang)', 'is_component_build=<(component)', 'is_debug=<(CONFIGURATION_NAME)', # Not available in gyp. @@ -187,22 +271,22 @@ 'target_name': 'v8_maybe_snapshot', 'type': 'none', 'conditions': [ - ['v8_use_snapshot!="true"', { + ['v8_use_snapshot!=1', { # The dependency on v8_base should come from a transitive # dependency however the Android toolchain requires libv8_base.a # to appear before libv8_snapshot.a so it's listed explicitly. 'dependencies': ['v8_base', 'v8_init', 'v8_nosnapshot'], }], - ['v8_use_snapshot=="true" and v8_use_external_startup_data==0', { + ['v8_use_snapshot==1 and v8_use_external_startup_data==0', { # The dependency on v8_base should come from a transitive # dependency however the Android toolchain requires libv8_base.a # to appear before libv8_snapshot.a so it's listed explicitly. 'dependencies': ['v8_base', 'v8_snapshot'], }], - ['v8_use_snapshot=="true" and v8_use_external_startup_data==1 and want_separate_host_toolset==0', { + ['v8_use_snapshot==1 and v8_use_external_startup_data==1 and want_separate_host_toolset==0', { 'dependencies': ['v8_base', 'v8_external_snapshot'], }], - ['v8_use_snapshot=="true" and v8_use_external_startup_data==1 and want_separate_host_toolset==1', { + ['v8_use_snapshot==1 and v8_use_external_startup_data==1 and want_separate_host_toolset==1', { 'dependencies': ['v8_base', 'v8_external_snapshot'], }], ['want_separate_host_toolset==1', { @@ -468,7 +552,7 @@ 'mksnapshot_flags': [ '--turbo_instruction_scheduling', ], }, 'conditions': [ - ['v8_enable_embedded_builtins == "true"', { + ['v8_enable_embedded_builtins == 1', { # In this case we use `embedded_variant "Default"` # and `suffix = ''` for the template `embedded${suffix}.S`. 'outputs': [ '<(INTERMEDIATE_DIR)/embedded.S' ], @@ -508,7 +592,7 @@ 'mksnapshot_flags': [ '<(v8_embed_script)' ], }, }], - ['v8_enable_snapshot_code_comments == "true"', { + ['v8_enable_snapshot_code_comments == 1', { 'variables': { 'mksnapshot_flags': [ '--code-comments' ], }, @@ -719,6 +803,8 @@ '../src/checks.h', '../src/code-comments.cc', '../src/code-comments.h', + '../src/code-desc.cc', + '../src/code-desc.h', '../src/code-events.h', '../src/code-factory.cc', '../src/code-factory.h', @@ -1045,22 +1131,25 @@ '../src/flag-definitions.h', '../src/flags.cc', '../src/flags.h', + '../src/flush-instruction-cache.cc', + '../src/flush-instruction-cache.h', '../src/frame-constants.h', '../src/frames-inl.h', '../src/frames.cc', '../src/frames.h', + '../src/function-kind.h', '../src/futex-emulation.cc', '../src/futex-emulation.h', '../src/gdb-jit.cc', '../src/gdb-jit.h', '../src/global-handles.cc', '../src/global-handles.h', - '../src/globals.h', '../src/handler-table.cc', '../src/handler-table.h', '../src/handles-inl.h', '../src/handles.cc', '../src/handles.h', + '../src/hash-seed-inl.h', '../src/heap-symbols.h', '../src/heap/array-buffer-collector.cc', '../src/heap/array-buffer-collector.h', @@ -1112,6 +1201,8 @@ '../src/heap/objects-visiting-inl.h', '../src/heap/objects-visiting.cc', '../src/heap/objects-visiting.h', + '../src/heap/read-only-heap.cc', + '../src/heap/read-only-heap.h', '../src/heap/remembered-set.h', '../src/heap/scavenge-job.cc', '../src/heap/scavenge-job.h', @@ -1250,6 +1341,8 @@ '../src/objects-printer.cc', '../src/objects.cc', '../src/objects.h', + '../src/objects/allocation-site-inl.h', + '../src/objects/allocation-site.h', '../src/objects/api-callbacks-inl.h', '../src/objects/api-callbacks.h', '../src/objects/arguments-inl.h', @@ -1260,9 +1353,11 @@ '../src/objects/cell-inl.h', '../src/objects/cell.h', '../src/objects/code-inl.h', + '../src/objects/code.cc', '../src/objects/code.h', '../src/objects/compilation-cache-inl.h', '../src/objects/compilation-cache.h', + '../src/objects/data-handler.h', '../src/objects/debug-objects-inl.h', '../src/objects/debug-objects.cc', '../src/objects/debug-objects.h', @@ -1319,6 +1414,7 @@ '../src/objects/js-number-format.cc', '../src/objects/js-number-format.h', '../src/objects/js-objects-inl.h', + '../src/objects/js-objects.cc', '../src/objects/js-objects.h', '../src/objects/js-plural-rules-inl.h', '../src/objects/js-plural-rules.cc', @@ -1349,6 +1445,7 @@ '../src/objects/managed.h', '../src/objects/map-inl.h', '../src/objects/map.h', + '../src/objects/map.cc', '../src/objects/maybe-object-inl.h', '../src/objects/maybe-object.h', '../src/objects/microtask-inl.h', @@ -1386,13 +1483,18 @@ '../src/objects/slots-inl.h', '../src/objects/slots.h', '../src/objects/stack-frame-info-inl.h', + '../src/objects/stack-frame-info.cc', '../src/objects/stack-frame-info.h', + '../src/objects/string-comparator.cc', + '../src/objects/string-comparator.h', '../src/objects/string-inl.h', '../src/objects/string-table-inl.h', '../src/objects/string-table.h', + '../src/objects/string.cc', '../src/objects/string.h', '../src/objects/struct-inl.h', '../src/objects/struct.h', + '../src/objects/template-objects-inl.h', '../src/objects/template-objects.cc', '../src/objects/template-objects.h', '../src/objects/templates-inl.h', @@ -1413,7 +1515,6 @@ '../src/parsing/parser.h', '../src/parsing/parsing.cc', '../src/parsing/parsing.h', - '../src/parsing/pattern-rewriter.cc', '../src/parsing/preparse-data-impl.h', '../src/parsing/preparse-data.cc', '../src/parsing/preparse-data.h', @@ -1608,6 +1709,8 @@ '../src/third_party/utf8-decoder/utf8-decoder.h', '../src/thread-id.cc', '../src/thread-id.h', + '../src/thread-local-top.cc', + '../src/thread-local-top.h', '../src/tracing/trace-event.cc', '../src/tracing/trace-event.h', '../src/tracing/traced-value.cc', @@ -1737,6 +1840,7 @@ '../src/zone/zone-list-inl.h', '../src/zone/zone-segment.cc', '../src/zone/zone-segment.h', + '../src/zone/zone-splay-tree.h', '../src/zone/zone.cc', '../src/zone/zone.h', '<(generate_bytecode_builtins_list_output)', @@ -2026,7 +2130,7 @@ 'BUILDING_V8_SHARED', ], }], - ['v8_postmortem_support=="true"', { + ['v8_postmortem_support==1', { 'dependencies': [ 'postmortem-metadata#target' ], 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc', @@ -2575,8 +2679,12 @@ '../src/torque/implementation-visitor.h', '../src/torque/instructions.cc', '../src/torque/instructions.h', + '../src/torque/server-data.cc', + '../src/torque/server-data.h', '../src/torque/source-positions.cc', '../src/torque/source-positions.h', + '../src/torque/torque-compiler.cc', + '../src/torque/torque-compiler.h', '../src/torque/torque-parser.cc', '../src/torque/torque-parser.h', '../src/torque/type-oracle.cc', @@ -2645,7 +2753,9 @@ '../src/objects/js-regexp-string-iterator-inl.h', '../src/objects/js-regexp-string-iterator.h', '../src/objects/map.h', + '../src/objects/map.cc', '../src/objects/map-inl.h', + '../src/objects/js-objects.cc', '../src/objects/name.h', '../src/objects/name-inl.h', '../src/objects/oddball-inl.h', @@ -2655,7 +2765,10 @@ '../src/objects/script-inl.h', '../src/objects/shared-function-info.h', '../src/objects/shared-function-info-inl.h', + '../src/objects/string.cc', '../src/objects/string.h', + '../src/objects/string-comparator.cc', + '../src/objects/string-comparator.h', '../src/objects/string-inl.h', '../src/objects/struct.h', '../src/objects/struct-inl.h', diff --git a/deps/v8/gypfiles/v8_external_snapshot.gypi b/deps/v8/gypfiles/v8_external_snapshot.gypi index fa6f1916c82886..8620d1c5da7135 100644 --- a/deps/v8/gypfiles/v8_external_snapshot.gypi +++ b/deps/v8/gypfiles/v8_external_snapshot.gypi @@ -64,7 +64,7 @@ ['v8_os_page_size!=0', { 'mksnapshot_flags': ['--v8_os_page_size', '<(v8_os_page_size)'], }], - ['v8_enable_embedded_builtins="true"', { + ['v8_enable_embedded_builtins=1', { # 'embedded_builtins_snapshot_src': [ "$target_gen_dir/embedded${suffix}.cc" ], # 'mksnapshot_flags': ["--embedded_src", "$target_gen_dir/embedded${suffix}.cc",], # if (invoker.embedded_variant != "") { diff --git a/doc/api/process.md b/doc/api/process.md index ed5e38dd4c817a..fa411096627268 100644 --- a/doc/api/process.md +++ b/doc/api/process.md @@ -669,7 +669,7 @@ An example of the possible output looks like: node_shared_openssl: 'false', strict_aliasing: 'true', target_arch: 'x64', - v8_use_snapshot: 'true' + v8_use_snapshot: 1 } } ``` diff --git a/node.gyp b/node.gyp index 81be566ddf8e28..6b76dab1018a9b 100644 --- a/node.gyp +++ b/node.gyp @@ -1,7 +1,7 @@ { 'variables': { - 'v8_use_snapshot%': 'false', - 'v8_use_siphash%': 'true', + 'v8_use_siphash%': 0, + 'v8_use_snapshot%': 0, 'v8_trace_maps%': 0, 'node_use_dtrace%': 'false', 'node_use_etw%': 'false', diff --git a/node.gypi b/node.gypi index 7f7ea0aa2cb5fd..6d7547fe060463 100644 --- a/node.gypi +++ b/node.gypi @@ -138,7 +138,7 @@ [ 'node_no_browser_globals=="true"', { 'defines': [ 'NODE_NO_BROWSER_GLOBALS' ], } ], - [ 'node_use_bundled_v8=="true" and v8_postmortem_support=="true" and force_load=="true"', { + [ 'node_use_bundled_v8=="true" and v8_postmortem_support==1 and force_load=="true"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-force_load,<(v8_base)', diff --git a/src/inspector/node_inspector.gypi b/src/inspector/node_inspector.gypi index 5191543ab73450..4637263434f778 100644 --- a/src/inspector/node_inspector.gypi +++ b/src/inspector/node_inspector.gypi @@ -115,7 +115,7 @@ { 'action_name': 'concatenate_protocols', 'inputs': [ - '../../deps/v8/src/inspector/js_protocol.json', + '../../deps/v8/src/inspector/js_protocol.pdl', '<(SHARED_INTERMEDIATE_DIR)/node_protocol.json', ], 'outputs': [