diff --git a/BUILD.gn b/BUILD.gn index d3e7c8378c..24affdc963 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -33,10 +33,6 @@ declare_args() { # Dynamically set an additional dependency from v8/custom_deps. v8_custom_deps = "" - # Separate control for dchecks in V8. Defaults to Chromium's behavior if - # built with Chromium. - v8_dcheck_always_on = build_with_chromium && dcheck_always_on - # Turns on all V8 debug features. Enables running V8 in a pseudo debug mode # within a release Chrome. v8_enable_debugging_features = is_debug @@ -362,7 +358,7 @@ if (v8_enable_trace_maps == "") { v8_enable_trace_maps = v8_enable_debugging_features } if (v8_enable_test_features == "") { - v8_enable_test_features = v8_enable_debugging_features || v8_dcheck_always_on + v8_enable_test_features = v8_enable_debugging_features || dcheck_always_on } if (v8_enable_v8_checks == "") { v8_enable_v8_checks = v8_enable_debugging_features @@ -1145,7 +1141,7 @@ config("toolchain") { if (v8_enable_slow_dchecks) { defines += [ "ENABLE_SLOW_DCHECKS" ] } - } else if (v8_dcheck_always_on) { + } else if (dcheck_always_on) { defines += [ "DEBUG" ] } @@ -1990,6 +1986,7 @@ action("v8_dump_build_config") { args = [ rebase_path("$root_out_dir/v8_build_config.json", root_build_dir), "current_cpu=\"$current_cpu\"", + "dcheck_always_on=$dcheck_always_on", "is_android=$is_android", "is_asan=$is_asan", "is_cfi=$is_cfi", @@ -2003,7 +2000,6 @@ action("v8_dump_build_config") { "is_ubsan_vptr=$is_ubsan_vptr", "target_cpu=\"$target_cpu\"", "v8_current_cpu=\"$v8_current_cpu\"", - "v8_dcheck_always_on=$v8_dcheck_always_on", "v8_enable_atomic_marking_state=$v8_enable_atomic_marking_state", "v8_enable_atomic_object_field_writes=" + "$v8_enable_atomic_object_field_writes", diff --git a/infra/mb/mb_config.pyl b/infra/mb/mb_config.pyl index bb13e86314..85c525ec6a 100644 --- a/infra/mb/mb_config.pyl +++ b/infra/mb/mb_config.pyl @@ -396,7 +396,7 @@ # TODO(v8:v7703): Make pointer compression bots testing non pointer # compression mode while pointer compression is temporarily enabled # on arm64 - 'release_bot', 'simulate_arm64', 'v8_dcheck_always_on', + 'release_bot', 'simulate_arm64', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_disable_pointer_compression'], 'release_simulate_arm64_msan': [ 'release_bot', 'simulate_arm64', 'msan'], @@ -469,7 +469,7 @@ 'release_x64_asan_no_lsan_verify_heap': [ 'release_bot', 'x64', 'asan', 'v8_verify_heap'], 'release_x64_asan_no_lsan_verify_heap_dchecks': [ - 'release_bot', 'x64', 'asan', 'v8_dcheck_always_on', + 'release_bot', 'x64', 'asan', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_verify_heap'], 'release_x64_asan_symbolized_verify_heap': [ 'release_bot', 'x64', 'asan', 'lsan', 'symbolized', @@ -479,7 +479,7 @@ 'release_x64_cfi_clusterfuzz': [ 'release_bot', 'x64', 'cfi_clusterfuzz'], 'release_x64_fuzzilli': [ - 'release_bot', 'x64', 'v8_dcheck_always_on', 'v8_enable_slow_dchecks', + 'release_bot', 'x64', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_verify_heap', 'v8_verify_csa', 'fuzzilli'], 'release_x64_msvc': [ 'release_bot_no_goma', 'x64', 'minimal_symbols', 'msvc'], @@ -501,7 +501,7 @@ 'release_x64_minimal_symbols': [ 'release_bot', 'x64', 'minimal_symbols'], 'release_x64_pointer_compression': [ - 'release_bot', 'x64', 'v8_dcheck_always_on', 'v8_enable_slow_dchecks', + 'release_bot', 'x64', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_disable_pointer_compression'], 'release_x64_pointer_compression_without_dchecks': [ 'release_bot', 'x64', 'v8_disable_pointer_compression'], @@ -526,7 +526,7 @@ 'release_x64_shared_verify_heap': [ 'release_bot', 'x64', 'shared', 'v8_verify_heap'], 'release_x64_verify_csa': [ - 'release_bot', 'x64', 'v8_dcheck_always_on', + 'release_bot', 'x64', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_verify_csa'], 'release_x64_webassembly_disabled': [ 'release_bot', 'x64', 'webassembly_disabled'], @@ -610,7 +610,7 @@ 'release_x86_trybot': [ 'release_trybot', 'x86'], 'release_x86_verify_csa': [ - 'release_bot', 'x86', 'v8_dcheck_always_on', + 'release_bot', 'x86', 'dcheck_always_on', 'v8_enable_slow_dchecks', 'v8_verify_csa'], # Official configs for x86. @@ -664,8 +664,8 @@ 'gn_args': 'v8_code_coverage=true', }, - 'v8_dcheck_always_on': { - 'gn_args': 'v8_dcheck_always_on=true', + 'dcheck_always_on': { + 'gn_args': 'dcheck_always_on=true', }, 'debug': { @@ -799,7 +799,7 @@ }, 'release_trybot': { - 'mixins': ['release_bot', 'minimal_symbols', 'v8_dcheck_always_on'], + 'mixins': ['release_bot', 'minimal_symbols', 'dcheck_always_on'], }, 'official': { diff --git a/test/inspector/inspector.status b/test/inspector/inspector.status index 829a96ad9e..9ebdbca188 100644 --- a/test/inspector/inspector.status +++ b/test/inspector/inspector.status @@ -29,12 +29,12 @@ }], # ALWAYS ############################################################################## -['mode != debug or v8_dcheck_always_on', { +['mode != debug or dcheck_always_on', { # Investigating flaky tests: https://crbug.com/v8/10876. Enable only on pure debug. 'debugger/pause-on-oom': [SKIP], 'debugger/pause-on-oom-wide': [SKIP], 'debugger/pause-on-oom-extrawide': [SKIP], -}], # 'mode != debug or v8_dcheck_always_on' +}], # 'mode != debug or dcheck_always_on' ############################################################################## ['system == android', { diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index 6c9405a45c..aae647e02d 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -103,7 +103,7 @@ ############################################################################## # Tests verifying CHECK and ASSERT. 'verify-check-false': [FAIL, NO_VARIANTS], - 'verify-assert-false': [NO_VARIANTS, ['mode == release and v8_dcheck_always_on == False', PASS], ['mode == debug', FAIL]], + 'verify-assert-false': [NO_VARIANTS, ['mode == release and dcheck_always_on == False', PASS], ['mode == debug', FAIL]], ############################################################################## # Tests with different versions for release and debug. @@ -138,15 +138,15 @@ 'regress/regress-655573': [PASS, SLOW], 'regress/regress-1200351': [PASS, SLOW], 'regress/regress-crbug-808192': [PASS, SLOW, NO_VARIANTS, ['arch not in (ia32, x64)', SKIP], ['tsan', SKIP]], - 'regress/regress-crbug-918301': [PASS, SLOW, NO_VARIANTS, ['mode != release or v8_dcheck_always_on', SKIP], ['(arch == arm or arch == arm64) and simulator_run', SKIP]], + 'regress/regress-crbug-918301': [PASS, SLOW, NO_VARIANTS, ['mode != release or dcheck_always_on', SKIP], ['(arch == arm or arch == arm64) and simulator_run', SKIP]], 'regress/wasm/regress-810973': [PASS, SLOW], 'sealed-array-reduce': [PASS, SLOW], 'string-replace-gc': [PASS, SLOW], 'wasm/embenchen/*': [PASS, SLOW], 'wasm/futex': [PASS, SLOW], 'wasm/unreachable-validation': [PASS, SLOW], - 'wasm/atomics-stress': [PASS, SLOW, NO_VARIANTS, ['mode != release or v8_dcheck_always_on', SKIP], ['tsan', SKIP]], - 'wasm/atomics64-stress': [PASS, SLOW, NO_VARIANTS, ['mode != release or v8_dcheck_always_on', SKIP], ['tsan', SKIP]], + 'wasm/atomics-stress': [PASS, SLOW, NO_VARIANTS, ['mode != release or dcheck_always_on', SKIP], ['tsan', SKIP]], + 'wasm/atomics64-stress': [PASS, SLOW, NO_VARIANTS, ['mode != release or dcheck_always_on', SKIP], ['tsan', SKIP]], 'wasm/compare-exchange-stress': [PASS, SLOW, NO_VARIANTS], 'wasm/compare-exchange64-stress': [PASS, SLOW, NO_VARIANTS], diff --git a/test/webkit/webkit.status b/test/webkit/webkit.status index f664fac0c5..d68ed00038 100644 --- a/test/webkit/webkit.status +++ b/test/webkit/webkit.status @@ -70,10 +70,10 @@ # Too slow on debug simulators. 'dfg-inline-function-dot-caller': [SKIP], }], # 'mode == debug and simulator_run' -['v8_dcheck_always_on == True and (arch == arm or arch == arm64)', { +['dcheck_always_on == True and (arch == arm or arch == arm64)', { # Doesn't work with gcc 4.6 on arm or arm64 for some reason. 'reentrant-caching': [SKIP], -}], # 'v8_dcheck_always_on == True and (arch == arm or arch == arm64)' +}], # 'dcheck_always_on == True and (arch == arm or arch == arm64)' ['arch == mips', { # Too slow for mips big-endian boards on bots (no FPU). 'dfg-int-overflow-in-loop': [SKIP], diff --git a/tools/testrunner/base_runner.py b/tools/testrunner/base_runner.py index e26a1015ca..009893a23a 100644 --- a/tools/testrunner/base_runner.py +++ b/tools/testrunner/base_runner.py @@ -173,7 +173,7 @@ class BuildConfig(object): self.control_flow_integrity = build_config['v8_control_flow_integrity'] self.concurrent_marking = build_config['v8_enable_concurrent_marking'] self.single_generation = build_config['v8_enable_single_generation'] - self.v8_dcheck_always_on = build_config['v8_dcheck_always_on'] + self.dcheck_always_on = build_config['dcheck_always_on'] self.gcov_coverage = build_config['is_gcov_coverage'] self.is_android = build_config['is_android'] self.is_clang = build_config['is_clang'] @@ -212,8 +212,8 @@ class BuildConfig(object): detected_options.append('cfi_vptr') if self.control_flow_integrity: detected_options.append('control_flow_integrity') - if self.v8_dcheck_always_on: - detected_options.append('v8_dcheck_always_on') + if self.dcheck_always_on: + detected_options.append('dcheck_always_on') if self.gcov_coverage: detected_options.append('gcov_coverage') if self.msan: @@ -495,7 +495,7 @@ class BaseTestRunner(object): def _process_default_options(self, options): if self.build_config.is_debug: self.mode_options = DEBUG_MODE - elif self.build_config.v8_dcheck_always_on: + elif self.build_config.dcheck_always_on: self.mode_options = TRY_RELEASE_MODE else: self.mode_options = RELEASE_MODE @@ -683,7 +683,7 @@ class BaseTestRunner(object): "control_flow_integrity": self.build_config.control_flow_integrity, "concurrent_marking": self.build_config.concurrent_marking, "single_generation": self.build_config.single_generation, - "v8_dcheck_always_on": self.build_config.v8_dcheck_always_on, + "dcheck_always_on": self.build_config.dcheck_always_on, "deopt_fuzzer": False, "endurance_fuzzer": False, "gc_fuzzer": False, diff --git a/tools/unittests/run_tests_test.py b/tools/unittests/run_tests_test.py index 5c568c74b7..d9e998312e 100755 --- a/tools/unittests/run_tests_test.py +++ b/tools/unittests/run_tests_test.py @@ -345,7 +345,7 @@ class SystemTest(unittest.TestCase): """ with temp_base() as basedir: override_build_config( - basedir, v8_dcheck_always_on=True, is_asan=True, is_cfi=True, + basedir, dcheck_always_on=True, is_asan=True, is_cfi=True, is_msan=True, is_tsan=True, is_ubsan_vptr=True, target_cpu='x86', v8_enable_i18n_support=False, v8_target_cpu='x86', v8_enable_verify_csa=False, v8_enable_lite_mode=False, @@ -361,7 +361,7 @@ class SystemTest(unittest.TestCase): '>>> Autodetected:\n' 'asan\n' 'cfi_vptr\n' - 'v8_dcheck_always_on\n' + 'dcheck_always_on\n' 'msan\n' 'no_i18n\n' 'tsan\n' diff --git a/tools/unittests/testdata/testroot1/v8_build_config.json b/tools/unittests/testdata/testroot1/v8_build_config.json index 7e95cbb4f5..04ccbb1600 100644 --- a/tools/unittests/testdata/testroot1/v8_build_config.json +++ b/tools/unittests/testdata/testroot1/v8_build_config.json @@ -1,6 +1,6 @@ { "current_cpu": "x64", - "v8_dcheck_always_on": false, + "dcheck_always_on": false, "is_android": false, "is_asan": false, "is_cfi": false, diff --git a/tools/unittests/testdata/testroot2/v8_build_config.json b/tools/unittests/testdata/testroot2/v8_build_config.json index 7ab8af6e90..b3e36ef6de 100644 --- a/tools/unittests/testdata/testroot2/v8_build_config.json +++ b/tools/unittests/testdata/testroot2/v8_build_config.json @@ -1,6 +1,6 @@ { "current_cpu": "x64", - "v8_dcheck_always_on": false, + "dcheck_always_on": false, "is_android": false, "is_asan": false, "is_cfi": false, diff --git a/tools/unittests/testdata/testroot3/v8_build_config.json b/tools/unittests/testdata/testroot3/v8_build_config.json index 7e95cbb4f5..04ccbb1600 100644 --- a/tools/unittests/testdata/testroot3/v8_build_config.json +++ b/tools/unittests/testdata/testroot3/v8_build_config.json @@ -1,6 +1,6 @@ { "current_cpu": "x64", - "v8_dcheck_always_on": false, + "dcheck_always_on": false, "is_android": false, "is_asan": false, "is_cfi": false,