Skip to content

Commit 492b0d6

Browse files
targosrichardlau
authored andcommitted
deps: V8: cherry-pick e6f62a41f5ee
Original commit message: [build] Remove jumbo build configs Bug: chromium:994387 Change-Id: I7b37a416ce6cc79903fe04923e86af1d0065ac37 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1890090 Reviewed-by: Maya Lekova <mslekova@chromium.org> Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#64669} Refs: v8/v8@e6f62a4 PR-URL: #39245 Refs: nodejs/build#2696 Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent 2b54156 commit 492b0d6

File tree

6 files changed

+5
-87
lines changed

6 files changed

+5
-87
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
# Reset this number to 0 on major V8 upgrades.
3636
# Increment by one for each non-official patch applied to deps/v8.
37-
'v8_embedder_string': '-node.49',
37+
'v8_embedder_string': '-node.50',
3838

3939
##### V8 defaults for Node.js #####
4040

deps/v8/BUILD.gn

-35
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import("//build/config/android/config.gni")
66
import("//build/config/arm.gni")
77
import("//build/config/dcheck_always_on.gni")
88
import("//build/config/host_byteorder.gni")
9-
import("//build/config/jumbo.gni")
109
import("//build/config/mips.gni")
1110
import("//build/config/sanitizers/sanitizers.gni")
1211
import("//build_overrides/build.gni")
@@ -1470,17 +1469,12 @@ if (v8_use_snapshot && v8_use_external_startup_data) {
14701469
if (v8_use_multi_snapshots) {
14711470
deps += [ ":asm_to_inline_asm_trusted" ]
14721471
sources += [ "$target_gen_dir/embedded_trusted.cc" ]
1473-
jumbo_excluded_sources = [ "$target_gen_dir/embedded_trusted.cc" ]
14741472
}
14751473
} else if (v8_enable_embedded_builtins) {
14761474
sources += [ "$target_gen_dir/embedded.S" ]
14771475

14781476
if (v8_use_multi_snapshots) {
14791477
sources += [ "$target_gen_dir/embedded_trusted.S" ]
1480-
jumbo_excluded_sources = [
1481-
# Duplicated symbols with embedded.S
1482-
"$target_gen_dir/embedded_trusted.S",
1483-
]
14841478
}
14851479
} else {
14861480
sources += [ "src/snapshot/embedded/embedded-empty.cc" ]
@@ -1577,17 +1571,6 @@ v8_source_set("v8_initializers") {
15771571
"src/interpreter/interpreter-intrinsics-generator.h",
15781572
]
15791573

1580-
jumbo_excluded_sources = [
1581-
# TODO(mostynb@vewd.com): don't exclude these http://crbug.com/752428
1582-
"src/builtins/builtins-async-iterator-gen.cc",
1583-
"src/builtins/builtins-async-generator-gen.cc",
1584-
1585-
# These source files take an unusually large amount of time to
1586-
# compile. Build them separately to avoid bottlenecks.
1587-
"src/builtins/builtins-regexp-gen.cc",
1588-
"src/codegen/code-stub-assembler.cc",
1589-
]
1590-
15911574
if (v8_current_cpu == "x86") {
15921575
sources += [
15931576
### gcmole(arch:ia32) ###
@@ -2996,19 +2979,6 @@ v8_source_set("v8_base_without_compiler") {
29962979
sources += check_header_includes_sources
29972980
}
29982981

2999-
jumbo_excluded_sources = [
3000-
# TODO(mostynb@vewd.com): don't exclude these http://crbug.com/752428
3001-
"src/profiler/heap-snapshot-generator.cc", # Macro clash in mman-linux.h
3002-
3003-
# These source files take an unusually large amount of time to
3004-
# compile. Build them separately to avoid bottlenecks.
3005-
"src/api/api.cc",
3006-
"src/heap/heap.cc",
3007-
"src/objects/elements.cc",
3008-
"src/objects/objects.cc",
3009-
"src/parsing/parser.cc",
3010-
]
3011-
30122982
if (v8_current_cpu == "x86") {
30132983
sources += [ ### gcmole(arch:ia32) ###
30142984
"src/codegen/ia32/assembler-ia32-inl.h",
@@ -3162,11 +3132,6 @@ v8_source_set("v8_base_without_compiler") {
31623132
"src/diagnostics/unwinding-info-win64.h",
31633133
]
31643134
}
3165-
jumbo_excluded_sources += [
3166-
# TODO(mostynb@vewd.com): fix this code so it doesn't need
3167-
# to be excluded, see the comments inside.
3168-
"src/codegen/arm64/instructions-arm64-constants.cc",
3169-
]
31703135
} else if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel") {
31713136
sources += [ ### gcmole(arch:mipsel) ###
31723137
"src/codegen/mips/assembler-mips-inl.h",

deps/v8/gni/v8.gni

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
import("//build/config/jumbo.gni")
65
import("//build/config/sanitizers/sanitizers.gni")
76
import("//build/config/v8_target_cpu.gni")
87
import("//build/split_static_library.gni")
@@ -80,7 +79,7 @@ if (v8_use_multi_snapshots) {
8079
# build configuration. This allows us to set v8_use_multi_snapshots=true on
8180
# all bots, and e.g. no-snapshot bots will automatically do the right thing.
8281
v8_use_multi_snapshots =
83-
v8_use_external_startup_data && !build_with_chromium && !use_jumbo_build
82+
v8_use_external_startup_data && !build_with_chromium
8483
}
8584

8685
if (v8_enable_backtrace == "") {
@@ -149,9 +148,9 @@ template("v8_source_set") {
149148
defined(v8_static_library) && v8_static_library && is_win) {
150149
link_target_type = "jumbo_split_static_library"
151150
} else if (defined(v8_static_library) && v8_static_library) {
152-
link_target_type = "jumbo_static_library"
151+
link_target_type = "static_library"
153152
} else {
154-
link_target_type = "jumbo_source_set"
153+
link_target_type = "source_set"
155154
}
156155
target(link_target_type, target_name) {
157156
forward_variables_from(invoker,
@@ -170,7 +169,7 @@ template("v8_source_set") {
170169
}
171170

172171
template("v8_header_set") {
173-
jumbo_source_set(target_name) {
172+
source_set(target_name) {
174173
forward_variables_from(invoker, "*", [ "configs" ])
175174
configs -= v8_remove_configs
176175
configs += v8_add_configs

deps/v8/infra/mb/mb_config.pyl

-27
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@
6464
'V8 Linux64 - debug - header includes': 'debug_x64_header_includes',
6565
'V8 Linux64 - shared': 'release_x64_shared_verify_heap',
6666
'V8 Linux64 - verify csa': 'release_x64_verify_csa',
67-
# Jumbo.
68-
'V8 Linux64 Jumbo': 'release_x64_jumbo',
69-
'V8 Linux64 Jumbo - debug': 'debug_x64_jumbo',
70-
'V8 Linux64 Jumbo - limited': 'release_x64_jumbo_limited',
71-
'V8 Linux64 Jumbo - limited - debug': 'debug_x64_jumbo_limited',
7267
# Windows.
7368
'V8 Win32 - builder': 'release_x86_minimal_symbols',
7469
'V8 Win32 - debug builder': 'debug_x86_minimal_symbols',
@@ -230,8 +225,6 @@
230225
'v8_linux64_msan_rel': 'release_simulate_arm64_msan_minimal_symbols',
231226
'v8_linux64_sanitizer_coverage_rel':
232227
'release_x64_asan_minimal_symbols_coverage',
233-
'v8_linux64_jumbo_compile_rel': 'release_x64_jumbo_trybot',
234-
'v8_linux64_jumbo_limited_compile_rel': 'release_x64_jumbo_limited_trybot',
235228
'v8_linux64_tsan_rel': 'release_x64_tsan_minimal_symbols',
236229
'v8_linux64_tsan_isolates_rel_ng':
237230
'release_x64_tsan_minimal_symbols',
@@ -448,14 +441,6 @@
448441
'release_bot', 'x64', 'ios_simulator'],
449442
'release_x64_internal': [
450443
'release_bot', 'x64', 'v8_snapshot_internal'],
451-
'release_x64_jumbo': [
452-
'release_bot', 'x64', 'jumbo'],
453-
'release_x64_jumbo_trybot': [
454-
'release_trybot', 'x64', 'jumbo'],
455-
'release_x64_jumbo_limited': [
456-
'release_bot', 'x64', 'jumbo_limited'],
457-
'release_x64_jumbo_limited_trybot': [
458-
'release_trybot', 'x64', 'jumbo_limited'],
459444
'release_x64_minimal_symbols': [
460445
'release_bot', 'x64', 'minimal_symbols'],
461446
'release_x64_pointer_compression': [
@@ -499,10 +484,6 @@
499484
'debug_bot', 'x64', 'gcc', 'v8_check_header_includes'],
500485
'debug_x64_header_includes': [
501486
'debug_bot', 'x64', 'v8_check_header_includes'],
502-
'debug_x64_jumbo': [
503-
'debug_bot', 'x64', 'jumbo'],
504-
'debug_x64_jumbo_limited': [
505-
'debug_bot', 'x64', 'jumbo_limited'],
506487
'debug_x64_minimal_symbols': [
507488
'debug_bot', 'x64', 'minimal_symbols'],
508489
'debug_x64_perfetto': [
@@ -668,14 +649,6 @@
668649
'gn_args': 'target_cpu="x64" target_os="ios"',
669650
},
670651

671-
'jumbo': {
672-
'gn_args': 'use_jumbo_build=true',
673-
},
674-
675-
'jumbo_limited': {
676-
'gn_args': 'use_jumbo_build=true jumbo_file_merge_limit=50',
677-
},
678-
679652
'lsan': {
680653
'mixins': ['v8_enable_test_features'],
681654
'gn_args': 'is_lsan=true',

deps/v8/test/cctest/BUILD.gn

-10
Original file line numberDiff line numberDiff line change
@@ -294,16 +294,6 @@ v8_source_set("cctest_sources") {
294294
"wasm/wasm-run-utils.h",
295295
]
296296

297-
if (use_jumbo_build) {
298-
jumbo_excluded_sources = [
299-
# TODO(mostynb@opera.com): figure out the jumbo issues with these source
300-
# files, and include them in jumbo compilation units.
301-
"interpreter/bytecode-expectations-printer.cc",
302-
"interpreter/test-bytecode-generator.cc",
303-
"test-api.cc",
304-
]
305-
}
306-
307297
if (v8_current_cpu == "arm") {
308298
sources += [ ### gcmole(arch:arm) ###
309299
"assembler-helper-arm.cc",

deps/v8/test/unittests/BUILD.gn

-9
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,6 @@ v8_source_set("unittests_sources") {
233233
"zone/zone-unittest.cc",
234234
]
235235

236-
if (use_jumbo_build) {
237-
jumbo_excluded_sources = [
238-
# TODO(mostynb@opera.com): figure out how to make this build in both
239-
# modes. Template issues on windows if we add a functional_unittest
240-
# namespace as with the other files.
241-
"base/functional-unittest.cc",
242-
]
243-
}
244-
245236
if (v8_current_cpu == "arm") {
246237
sources += [
247238
"assembler/turbo-assembler-arm-unittest.cc",

0 commit comments

Comments
 (0)