From 1f953c3fe1fe71a6a3465505ec73cea6f424ec34 Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Fri, 23 Jun 2023 20:35:00 +0000 Subject: [PATCH] [vm, gc] Remove some dead code. TEST=ci Change-Id: Ia0d0f181b8d54c3ec0e1cc8f2076bea7854379ab Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/311142 Commit-Queue: Ryan Macnak Reviewed-by: Alexander Aprelev --- runtime/vm/cpu_arm.cc | 4 ---- runtime/vm/cpu_arm64.cc | 1 - runtime/vm/cpu_ia32.cc | 5 ----- runtime/vm/cpu_riscv.cc | 1 - runtime/vm/cpu_x64.cc | 4 ---- runtime/vm/handles_impl.h | 2 +- runtime/vm/handles_test.cc | 1 - runtime/vm/heap/gc_shared.h | 2 +- runtime/vm/heap/marker.cc | 1 - runtime/vm/heap/scavenger.h | 3 --- runtime/vm/parser.cc | 2 -- runtime/vm/unit_test.h | 1 - runtime/vm/virtual_memory_compressed.cc | 1 + runtime/vm/virtual_memory_compressed.h | 2 +- 14 files changed, 4 insertions(+), 26 deletions(-) diff --git a/runtime/vm/cpu_arm.cc b/runtime/vm/cpu_arm.cc index 90c995d701f..12bebc5d98b 100644 --- a/runtime/vm/cpu_arm.cc +++ b/runtime/vm/cpu_arm.cc @@ -9,10 +9,6 @@ #include "vm/cpu_arm.h" #include "vm/cpuinfo.h" -#include "vm/heap/heap.h" -#include "vm/isolate.h" -#include "vm/object.h" -#include "vm/simulator.h" #if !defined(TARGET_HOST_MISMATCH) #if defined(DART_HOST_OS_MACOS) || defined(DART_HOST_OS_IOS) diff --git a/runtime/vm/cpu_arm64.cc b/runtime/vm/cpu_arm64.cc index 4d01c5f2e99..b64a2ee9259 100644 --- a/runtime/vm/cpu_arm64.cc +++ b/runtime/vm/cpu_arm64.cc @@ -9,7 +9,6 @@ #include "vm/cpu_arm64.h" #include "vm/cpuinfo.h" -#include "vm/simulator.h" #if !defined(USING_SIMULATOR) #if defined(DART_HOST_OS_FUCHSIA) diff --git a/runtime/vm/cpu_ia32.cc b/runtime/vm/cpu_ia32.cc index 72d57372117..8fe5a9c4724 100644 --- a/runtime/vm/cpu_ia32.cc +++ b/runtime/vm/cpu_ia32.cc @@ -8,12 +8,7 @@ #include "vm/cpu.h" #include "vm/cpu_ia32.h" -#include "vm/compiler/assembler/assembler.h" -#include "vm/constants.h" #include "vm/cpuinfo.h" -#include "vm/heap/heap.h" -#include "vm/isolate.h" -#include "vm/object.h" namespace dart { diff --git a/runtime/vm/cpu_riscv.cc b/runtime/vm/cpu_riscv.cc index 9d0d2a9ed21..e1440a9d2ee 100644 --- a/runtime/vm/cpu_riscv.cc +++ b/runtime/vm/cpu_riscv.cc @@ -9,7 +9,6 @@ #include "vm/cpu_riscv.h" #include "vm/cpuinfo.h" -#include "vm/simulator.h" #if !defined(USING_SIMULATOR) #if !defined(DART_HOST_OS_FUCHSIA) diff --git a/runtime/vm/cpu_x64.cc b/runtime/vm/cpu_x64.cc index 2cb86b8002a..e9c360302f5 100644 --- a/runtime/vm/cpu_x64.cc +++ b/runtime/vm/cpu_x64.cc @@ -8,11 +8,7 @@ #include "vm/cpu.h" #include "vm/cpu_x64.h" -#include "vm/constants.h" #include "vm/cpuinfo.h" -#include "vm/heap/heap.h" -#include "vm/isolate.h" -#include "vm/object.h" namespace dart { diff --git a/runtime/vm/handles_impl.h b/runtime/vm/handles_impl.h index 1f2ffee82cd..fe79513e014 100644 --- a/runtime/vm/handles_impl.h +++ b/runtime/vm/handles_impl.h @@ -5,7 +5,7 @@ #ifndef RUNTIME_VM_HANDLES_IMPL_H_ #define RUNTIME_VM_HANDLES_IMPL_H_ -#include "vm/heap/heap.h" +#include "vm/handle_visitor.h" #include "vm/thread.h" #include "vm/visitor.h" diff --git a/runtime/vm/handles_test.cc b/runtime/vm/handles_test.cc index d838186cfbe..1e293fb55e7 100644 --- a/runtime/vm/handles_test.cc +++ b/runtime/vm/handles_test.cc @@ -6,7 +6,6 @@ #include "platform/assert.h" #include "vm/dart_api_state.h" #include "vm/flags.h" -#include "vm/heap/heap.h" #include "vm/object.h" #include "vm/unit_test.h" #include "vm/zone.h" diff --git a/runtime/vm/heap/gc_shared.h b/runtime/vm/heap/gc_shared.h index 12c24a573bf..378932b5676 100644 --- a/runtime/vm/heap/gc_shared.h +++ b/runtime/vm/heap/gc_shared.h @@ -13,7 +13,7 @@ #endif #include "vm/dart_api_state.h" -#include "vm/heap/scavenger.h" +#include "vm/heap/heap.h" #include "vm/log.h" #include "vm/message_handler.h" #include "vm/object.h" diff --git a/runtime/vm/heap/marker.cc b/runtime/vm/heap/marker.cc index b1c7cd49dd2..dbc8fa27f81 100644 --- a/runtime/vm/heap/marker.cc +++ b/runtime/vm/heap/marker.cc @@ -430,7 +430,6 @@ class MarkingVisitorBase : public ObjectPointerVisitor { PushMarked(raw_obj); } - Thread* thread_; PageSpace* page_space_; MarkerWorkList work_list_; MarkerWorkList deferred_work_list_; diff --git a/runtime/vm/heap/scavenger.h b/runtime/vm/heap/scavenger.h index c74af307c5f..0477a943b67 100644 --- a/runtime/vm/heap/scavenger.h +++ b/runtime/vm/heap/scavenger.h @@ -212,11 +212,8 @@ class Scavenger { ASSERT(external_size_ >= 0); } - void MakeNewSpaceIterable(); int64_t FreeSpaceInWords(Isolate* isolate) const; - bool scavenging() const { return scavenging_; } - // The maximum number of Dart mutator threads we allow to execute at the same // time. static intptr_t MaxMutatorThreadCount() { diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc index f2ef5b9abb1..9b7a6f379e4 100644 --- a/runtime/vm/parser.cc +++ b/runtime/vm/parser.cc @@ -21,8 +21,6 @@ #include "vm/growable_array.h" #include "vm/handles.h" #include "vm/hash_table.h" -#include "vm/heap/heap.h" -#include "vm/heap/safepoint.h" #include "vm/isolate.h" #include "vm/longjump.h" #include "vm/native_arguments.h" diff --git a/runtime/vm/unit_test.h b/runtime/vm/unit_test.h index e554f562d83..d264b879c01 100644 --- a/runtime/vm/unit_test.h +++ b/runtime/vm/unit_test.h @@ -15,7 +15,6 @@ #include "vm/dart_api_state.h" #include "vm/dart_entry.h" #include "vm/globals.h" -#include "vm/heap/heap.h" #include "vm/isolate.h" #include "vm/longjump.h" #include "vm/object.h" diff --git a/runtime/vm/virtual_memory_compressed.cc b/runtime/vm/virtual_memory_compressed.cc index 7a099403201..3832449b66a 100644 --- a/runtime/vm/virtual_memory_compressed.cc +++ b/runtime/vm/virtual_memory_compressed.cc @@ -5,6 +5,7 @@ #include "vm/virtual_memory_compressed.h" #include "platform/utils.h" +#include "vm/lockers.h" #if defined(DART_COMPRESSED_HEAP) diff --git a/runtime/vm/virtual_memory_compressed.h b/runtime/vm/virtual_memory_compressed.h index dbe80c1e9b9..2cbe421cd94 100644 --- a/runtime/vm/virtual_memory_compressed.h +++ b/runtime/vm/virtual_memory_compressed.h @@ -6,7 +6,7 @@ #define RUNTIME_VM_VIRTUAL_MEMORY_COMPRESSED_H_ #include "vm/globals.h" -#include "vm/heap/pages.h" +#include "vm/heap/page.h" #include "vm/memory_region.h" namespace dart {