[heap] Rename cppgc_shared targets to heap_base

This rename better reflects that heap_base is both used in cppgc but
also V8's GC.

Bug: v8:12691
Change-Id: Ia18ecba462d1b55cee6722452ceb28b25490a066
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3506374
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Dominik Inführ <dinfuehr@chromium.org>
Cr-Commit-Position: refs/heads/main@{#79398}
This commit is contained in:
Dominik Inführ 2022-03-08 09:50:47 +01:00 committed by V8 LUCI CQ
parent ebb6716f42
commit cc828bb4e8
4 changed files with 18 additions and 22 deletions

View File

@ -980,7 +980,7 @@ filegroup(
name = "v8_base_without_compiler_files", name = "v8_base_without_compiler_files",
srcs = [ srcs = [
":cppgc_base_files", ":cppgc_base_files",
":v8_cppgc_shared_files", ":v8_heap_base_files",
":v8_bigint", ":v8_bigint",
":generated_bytecode_builtins_list", ":generated_bytecode_builtins_list",
"include/cppgc/common.h", "include/cppgc/common.h",
@ -2857,6 +2857,7 @@ filegroup(
"src/heap/cppgc/gc-info-table.h", "src/heap/cppgc/gc-info-table.h",
"src/heap/cppgc/gc-invoker.cc", "src/heap/cppgc/gc-invoker.cc",
"src/heap/cppgc/gc-invoker.h", "src/heap/cppgc/gc-invoker.h",
"src/heap/cppgc/globals.h",
"src/heap/cppgc/heap.cc", "src/heap/cppgc/heap.cc",
"src/heap/cppgc/heap.h", "src/heap/cppgc/heap.h",
"src/heap/cppgc/heap-base.cc", "src/heap/cppgc/heap-base.cc",
@ -2934,13 +2935,12 @@ filegroup(
) )
filegroup( filegroup(
name = "v8_cppgc_shared_files", name = "v8_heap_base_files",
srcs = [ srcs = [
"src/heap/base/stack.cc", "src/heap/base/stack.cc",
"src/heap/base/stack.h", "src/heap/base/stack.h",
"src/heap/base/worklist.cc", "src/heap/base/worklist.cc",
"src/heap/base/worklist.h", "src/heap/base/worklist.h",
"src/heap/cppgc/globals.h",
] + select({ ] + select({
# Note these cannot be v8_target_is_* selects because these contain # Note these cannot be v8_target_is_* selects because these contain
# inline assembly that runs inside the executable. Since these are # inline assembly that runs inside the executable. Since these are

View File

@ -4849,8 +4849,8 @@ v8_source_set("v8_base_without_compiler") {
deps = [ deps = [
":torque_generated_definitions", ":torque_generated_definitions",
":v8_bigint", ":v8_bigint",
":v8_cppgc_shared",
":v8_headers", ":v8_headers",
":v8_heap_base",
":v8_libbase", ":v8_libbase",
":v8_shared_internal_headers", ":v8_shared_internal_headers",
":v8_tracing", ":v8_tracing",
@ -5456,13 +5456,12 @@ v8_source_set("v8_bigint") {
configs = [ ":internal_config" ] configs = [ ":internal_config" ]
} }
v8_source_set("v8_cppgc_shared") { v8_source_set("v8_heap_base") {
sources = [ sources = [
"src/heap/base/stack.cc", "src/heap/base/stack.cc",
"src/heap/base/stack.h", "src/heap/base/stack.h",
"src/heap/base/worklist.cc", "src/heap/base/worklist.cc",
"src/heap/base/worklist.h", "src/heap/base/worklist.h",
"src/heap/cppgc/globals.h",
] ]
if (is_clang || !is_win) { if (is_clang || !is_win) {
@ -5499,10 +5498,7 @@ v8_source_set("v8_cppgc_shared") {
configs = [ ":internal_config" ] configs = [ ":internal_config" ]
public_deps = [ public_deps = [ ":v8_libbase" ]
":cppgc_headers",
":v8_libbase",
]
} }
# This is split out to be a non-code containing target that the Chromium browser # This is split out to be a non-code containing target that the Chromium browser
@ -5589,6 +5585,7 @@ v8_source_set("cppgc_base") {
"src/heap/cppgc/gc-info.cc", "src/heap/cppgc/gc-info.cc",
"src/heap/cppgc/gc-invoker.cc", "src/heap/cppgc/gc-invoker.cc",
"src/heap/cppgc/gc-invoker.h", "src/heap/cppgc/gc-invoker.h",
"src/heap/cppgc/globals.h",
"src/heap/cppgc/heap-base.cc", "src/heap/cppgc/heap-base.cc",
"src/heap/cppgc/heap-base.h", "src/heap/cppgc/heap-base.h",
"src/heap/cppgc/heap-consistency.cc", "src/heap/cppgc/heap-consistency.cc",
@ -5683,7 +5680,7 @@ v8_source_set("cppgc_base") {
public_deps = [ public_deps = [
":cppgc_headers", ":cppgc_headers",
":v8_cppgc_shared", ":v8_heap_base",
":v8_libbase", ":v8_libbase",
":v8_libplatform", ":v8_libplatform",
] ]
@ -6114,10 +6111,10 @@ if (is_component_build) {
} }
} }
v8_component("v8_cppgc_shared_for_testing") { v8_component("v8_heap_base_for_testing") {
testonly = true testonly = true
public_deps = [ ":v8_cppgc_shared" ] public_deps = [ ":v8_heap_base" ]
configs = [] configs = []
public_configs = [ ":external_config" ] public_configs = [ ":external_config" ]
@ -6166,10 +6163,10 @@ if (is_component_build) {
} }
} }
group("v8_cppgc_shared_for_testing") { group("v8_heap_base_for_testing") {
testonly = true testonly = true
public_deps = [ ":v8_cppgc_shared" ] public_deps = [ ":v8_heap_base" ]
public_configs = [ ":external_config" ] public_configs = [ ":external_config" ]
} }

View File

@ -10,7 +10,6 @@
#include "src/base/sanitizer/asan.h" #include "src/base/sanitizer/asan.h"
#include "src/base/sanitizer/msan.h" #include "src/base/sanitizer/msan.h"
#include "src/base/sanitizer/tsan.h" #include "src/base/sanitizer/tsan.h"
#include "src/heap/cppgc/globals.h"
namespace heap { namespace heap {
namespace base { namespace base {

View File

@ -22,7 +22,7 @@ if (is_fuchsia) {
} }
} }
v8_executable("v8_cppgc_shared_unittests") { v8_executable("v8_heap_base_unittests") {
testonly = true testonly = true
configs = [ configs = [
@ -33,13 +33,13 @@ v8_executable("v8_cppgc_shared_unittests") {
sources = [ "heap/base/run-all-unittests.cc" ] sources = [ "heap/base/run-all-unittests.cc" ]
deps = [ deps = [
":v8_cppgc_shared_unittests_sources", ":v8_heap_base_unittests_sources",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]
} }
v8_source_set("v8_cppgc_shared_unittests_sources") { v8_source_set("v8_heap_base_unittests_sources") {
testonly = true testonly = true
sources = [ "heap/base/worklist-unittest.cc" ] sources = [ "heap/base/worklist-unittest.cc" ]
@ -50,7 +50,7 @@ v8_source_set("v8_cppgc_shared_unittests_sources") {
] ]
deps = [ deps = [
"../..:v8_cppgc_shared_for_testing", "../..:v8_heap_base_for_testing",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]
@ -75,7 +75,7 @@ if (cppgc_is_standalone) {
deps = [ deps = [
":cppgc_unittests_sources", ":cppgc_unittests_sources",
":v8_cppgc_shared_unittests_sources", ":v8_heap_base_unittests_sources",
"../..:cppgc_for_testing", "../..:cppgc_for_testing",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
@ -169,7 +169,7 @@ v8_executable("unittests") {
deps = [ deps = [
":unittests_sources", ":unittests_sources",
":v8_cppgc_shared_unittests_sources", ":v8_heap_base_unittests_sources",
"../..:v8_for_testing", "../..:v8_for_testing",
"../..:v8_libbase", "../..:v8_libbase",
"../..:v8_libplatform", "../..:v8_libplatform",