Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "deps: update V8 to 6.2.414.33" #16513

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deps/v8/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ action("v8_dump_build_config") {
is_gcov_coverage = v8_code_coverage && !is_clang
args = [
rebase_path("$root_out_dir/v8_build_config.json", root_build_dir),
"current_cpu=\"$current_cpu\"",
"dcheck_always_on=$dcheck_always_on",
"is_asan=$is_asan",
"is_cfi=$is_cfi",
Expand All @@ -837,6 +838,7 @@ action("v8_dump_build_config") {
"is_tsan=$is_tsan",
"is_ubsan_vptr=$is_ubsan_vptr",
"target_cpu=\"$target_cpu\"",
"v8_current_cpu=\"$v8_current_cpu\"",
"v8_enable_i18n_support=$v8_enable_i18n_support",
"v8_target_cpu=\"$v8_target_cpu\"",
"v8_use_snapshot=$v8_use_snapshot",
Expand Down
2 changes: 2 additions & 0 deletions deps/v8/gni/isolate.gni
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ template("v8_isolate_run") {
"--config-variable",
"icu_use_data_file_flag=$icu_use_data_file_flag",
"--config-variable",
"is_gn=1",
"--config-variable",
"msan=$msan",
"--config-variable",
"tsan=$tsan",
Expand Down
1 change: 1 addition & 0 deletions deps/v8/gypfiles/isolate.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
'--config-variable', 'gcmole=<(gcmole)',
'--config-variable', 'has_valgrind=<(has_valgrind)',
'--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
'--config-variable', 'is_gn=0',
'--config-variable', 'msan=<(msan)',
'--config-variable', 'tsan=<(tsan)',
'--config-variable', 'coverage=<(coverage)',
Expand Down
1 change: 0 additions & 1 deletion deps/v8/gypfiles/toolchain.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
'msvs_use_common_release': 0,
'clang%': 0,
'asan%': 0,
'cfi_vptr%': 0,
'lsan%': 0,
'msan%': 0,
'tsan%': 0,
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 6
#define V8_MINOR_VERSION 2
#define V8_BUILD_NUMBER 414
#define V8_PATCH_LEVEL 33
#define V8_PATCH_LEVEL 32

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
46 changes: 1 addition & 45 deletions deps/v8/src/v8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
{
'target_name': 'v8',
'dependencies_traverse': 1,
'dependencies': ['v8_maybe_snapshot', 'v8_dump_build_config'],
'dependencies': ['v8_maybe_snapshot'],
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
Expand Down Expand Up @@ -2499,49 +2499,5 @@
}],
],
},
{
'target_name': 'v8_dump_build_config',
'type': 'none',
'variables': {
},
'conditions': [
[ 'want_separate_host_toolset==1', {
'toolsets': ['host'],
}, {
'toolsets': ['target'],
}]
],
'actions': [
{
'action_name': 'v8_dump_build_config',
'inputs': [
'../tools/testrunner/utils/dump_build_config_gyp.py',
],
'outputs': [
'<(PRODUCT_DIR)/v8_build_config.json',
],
'action': [
'python',
'../tools/testrunner/utils/dump_build_config_gyp.py',
'<(PRODUCT_DIR)/v8_build_config.json',
'dcheck_always_on=<(dcheck_always_on)',
'is_asan=<(asan)',
'is_cfi=<(cfi_vptr)',
'is_component_build="<(component)"',
'is_debug="<(CONFIGURATION_NAME)"',
# Not available in gyp.
'is_gcov_coverage=0',
'is_msan=<(msan)',
'is_tsan=<(tsan)',
# Not available in gyp.
'is_ubsan_vptr=0',
'target_cpu="<(target_arch)"',
'v8_enable_i18n_support=<(v8_enable_i18n_support)',
'v8_target_cpu="<(v8_target_arch)"',
'v8_use_snapshot=<(v8_use_snapshot)',
],
},
],
},
],
}
2 changes: 1 addition & 1 deletion deps/v8/tools/foozzie/v8_foozzie.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def infer_arch(d8):
executable.
"""
with open(os.path.join(os.path.dirname(d8), 'v8_build_config.json')) as f:
arch = json.load(f)['v8_target_cpu']
arch = json.load(f)['v8_current_cpu']
return 'ia32' if arch == 'x86' else arch


Expand Down
8 changes: 7 additions & 1 deletion deps/v8/tools/testrunner/testrunner.isolate
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
'../run-tests.py',
],
'files': [
'<(PRODUCT_DIR)/v8_build_config.json',
'../run-tests.py',
'./'
],
Expand All @@ -21,5 +20,12 @@
],
},
}],
['is_gn==1', {
'variables': {
'files': [
'<(PRODUCT_DIR)/v8_build_config.json',
],
},
}],
],
}
4 changes: 2 additions & 2 deletions deps/v8/tools/testrunner/utils/dump_build_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
import os
import sys

assert len(sys.argv) > 2
assert len(sys.argv) > 1

def as_json(kv):
assert '=' in kv
k, v = kv.split('=', 1)
return k, json.loads(v)

with open(sys.argv[1], 'w') as f:
json.dump(dict(map(as_json, sys.argv[2:])), f)
json.dump(dict(as_json(kv) for kv in sys.argv[2:]), f)
47 changes: 0 additions & 47 deletions deps/v8/tools/testrunner/utils/dump_build_config_gyp.py

This file was deleted.