From a10e038f092b1177748674eaf83c52b3cbf882c3 Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Wed, 2 Jun 2021 22:50:14 +0000 Subject: [PATCH] [vm] Remove Script::compile_time_constants_. Dead since 5cce1e4acde9c166877a0c1a142e0cb458964478. TEST=ci Change-Id: If55de08b753e5948785187e455ac793356d1e794 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/202066 Commit-Queue: Ryan Macnak Reviewed-by: Ben Konyi --- .../vm/compiler/runtime_offsets_extracted.h | 24 +++++++++---------- runtime/vm/object.cc | 4 ---- runtime/vm/object.h | 5 ---- runtime/vm/raw_object.h | 5 ++-- runtime/vm/raw_object_fields.cc | 1 - 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h index a88073426b2..56e8f0e5295 100644 --- a/runtime/vm/compiler/runtime_offsets_extracted.h +++ b/runtime/vm/compiler/runtime_offsets_extracted.h @@ -527,7 +527,7 @@ static constexpr dart::compiler::target::word PcDescriptors_HeaderSize = 8; static constexpr dart::compiler::target::word Pointer_InstanceSize = 12; static constexpr dart::compiler::target::word ReceivePort_InstanceSize = 20; static constexpr dart::compiler::target::word RegExp_InstanceSize = 60; -static constexpr dart::compiler::target::word Script_InstanceSize = 56; +static constexpr dart::compiler::target::word Script_InstanceSize = 48; static constexpr dart::compiler::target::word SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word SingleTargetCache_InstanceSize = 16; @@ -1072,7 +1072,7 @@ static constexpr dart::compiler::target::word PcDescriptors_HeaderSize = 16; static constexpr dart::compiler::target::word Pointer_InstanceSize = 24; static constexpr dart::compiler::target::word ReceivePort_InstanceSize = 40; static constexpr dart::compiler::target::word RegExp_InstanceSize = 120; -static constexpr dart::compiler::target::word Script_InstanceSize = 96; +static constexpr dart::compiler::target::word Script_InstanceSize = 80; static constexpr dart::compiler::target::word SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word SingleTargetCache_InstanceSize = 32; @@ -1607,7 +1607,7 @@ static constexpr dart::compiler::target::word PcDescriptors_HeaderSize = 8; static constexpr dart::compiler::target::word Pointer_InstanceSize = 12; static constexpr dart::compiler::target::word ReceivePort_InstanceSize = 20; static constexpr dart::compiler::target::word RegExp_InstanceSize = 60; -static constexpr dart::compiler::target::word Script_InstanceSize = 56; +static constexpr dart::compiler::target::word Script_InstanceSize = 48; static constexpr dart::compiler::target::word SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word SingleTargetCache_InstanceSize = 16; @@ -2153,7 +2153,7 @@ static constexpr dart::compiler::target::word PcDescriptors_HeaderSize = 16; static constexpr dart::compiler::target::word Pointer_InstanceSize = 24; static constexpr dart::compiler::target::word ReceivePort_InstanceSize = 40; static constexpr dart::compiler::target::word RegExp_InstanceSize = 120; -static constexpr dart::compiler::target::word Script_InstanceSize = 96; +static constexpr dart::compiler::target::word Script_InstanceSize = 80; static constexpr dart::compiler::target::word SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word SingleTargetCache_InstanceSize = 32; @@ -2697,7 +2697,7 @@ static constexpr dart::compiler::target::word PcDescriptors_HeaderSize = 16; static constexpr dart::compiler::target::word Pointer_InstanceSize = 24; static constexpr dart::compiler::target::word ReceivePort_InstanceSize = 24; static constexpr dart::compiler::target::word RegExp_InstanceSize = 80; -static constexpr dart::compiler::target::word Script_InstanceSize = 64; +static constexpr dart::compiler::target::word Script_InstanceSize = 56; static constexpr dart::compiler::target::word SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word SingleTargetCache_InstanceSize = 32; @@ -3242,7 +3242,7 @@ static constexpr dart::compiler::target::word PcDescriptors_HeaderSize = 16; static constexpr dart::compiler::target::word Pointer_InstanceSize = 24; static constexpr dart::compiler::target::word ReceivePort_InstanceSize = 24; static constexpr dart::compiler::target::word RegExp_InstanceSize = 80; -static constexpr dart::compiler::target::word Script_InstanceSize = 64; +static constexpr dart::compiler::target::word Script_InstanceSize = 56; static constexpr dart::compiler::target::word SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word SingleTargetCache_InstanceSize = 32; @@ -7062,7 +7062,7 @@ static constexpr dart::compiler::target::word AOT_PcDescriptors_HeaderSize = 8; static constexpr dart::compiler::target::word AOT_Pointer_InstanceSize = 12; static constexpr dart::compiler::target::word AOT_ReceivePort_InstanceSize = 20; static constexpr dart::compiler::target::word AOT_RegExp_InstanceSize = 60; -static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 48; +static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 40; static constexpr dart::compiler::target::word AOT_SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_SingleTargetCache_InstanceSize = 16; @@ -7669,7 +7669,7 @@ static constexpr dart::compiler::target::word AOT_PcDescriptors_HeaderSize = 16; static constexpr dart::compiler::target::word AOT_Pointer_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_ReceivePort_InstanceSize = 40; static constexpr dart::compiler::target::word AOT_RegExp_InstanceSize = 120; -static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 80; +static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 72; static constexpr dart::compiler::target::word AOT_SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_SingleTargetCache_InstanceSize = 32; @@ -8280,7 +8280,7 @@ static constexpr dart::compiler::target::word AOT_PcDescriptors_HeaderSize = 16; static constexpr dart::compiler::target::word AOT_Pointer_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_ReceivePort_InstanceSize = 40; static constexpr dart::compiler::target::word AOT_RegExp_InstanceSize = 120; -static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 80; +static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 72; static constexpr dart::compiler::target::word AOT_SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_SingleTargetCache_InstanceSize = 32; @@ -10093,7 +10093,7 @@ static constexpr dart::compiler::target::word AOT_PcDescriptors_HeaderSize = 8; static constexpr dart::compiler::target::word AOT_Pointer_InstanceSize = 12; static constexpr dart::compiler::target::word AOT_ReceivePort_InstanceSize = 12; static constexpr dart::compiler::target::word AOT_RegExp_InstanceSize = 60; -static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 48; +static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 40; static constexpr dart::compiler::target::word AOT_SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_SingleTargetCache_InstanceSize = 16; @@ -10693,7 +10693,7 @@ static constexpr dart::compiler::target::word AOT_PcDescriptors_HeaderSize = 16; static constexpr dart::compiler::target::word AOT_Pointer_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_ReceivePort_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_RegExp_InstanceSize = 120; -static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 80; +static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 72; static constexpr dart::compiler::target::word AOT_SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_SingleTargetCache_InstanceSize = 32; @@ -11297,7 +11297,7 @@ static constexpr dart::compiler::target::word AOT_PcDescriptors_HeaderSize = 16; static constexpr dart::compiler::target::word AOT_Pointer_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_ReceivePort_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_RegExp_InstanceSize = 120; -static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 80; +static constexpr dart::compiler::target::word AOT_Script_InstanceSize = 72; static constexpr dart::compiler::target::word AOT_SendPort_InstanceSize = 24; static constexpr dart::compiler::target::word AOT_SingleTargetCache_InstanceSize = 32; diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc index 2b64b3fa19c..abe44ee3ab4 100644 --- a/runtime/vm/object.cc +++ b/runtime/vm/object.cc @@ -11600,10 +11600,6 @@ void Script::LoadSourceFromKernel(const uint8_t* kernel_buffer, } #endif // !defined(DART_PRECOMPILED_RUNTIME) -void Script::set_compile_time_constants(const Array& value) const { - untag()->set_compile_time_constants(value.ptr()); -} - void Script::set_kernel_program_info(const KernelProgramInfo& info) const { untag()->set_kernel_program_info(info.ptr()); } diff --git a/runtime/vm/object.h b/runtime/vm/object.h index 1d513f3c9f8..d778a53d669 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -4464,11 +4464,6 @@ class Script : public Object { // The load time in milliseconds since epoch. int64_t load_timestamp() const { return untag()->load_timestamp_; } - ArrayPtr compile_time_constants() const { - return untag()->compile_time_constants(); - } - void set_compile_time_constants(const Array& value) const; - KernelProgramInfoPtr kernel_program_info() const { return untag()->kernel_program_info(); } diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h index c3c101729e1..9955114b31a 100644 --- a/runtime/vm/raw_object.h +++ b/runtime/vm/raw_object.h @@ -1545,7 +1545,6 @@ class alignas(8) UntaggedScript : public UntaggedObject { COMPRESSED_POINTER_FIELD(StringPtr, url) VISIT_FROM(url) COMPRESSED_POINTER_FIELD(StringPtr, resolved_url) - COMPRESSED_POINTER_FIELD(ArrayPtr, compile_time_constants) COMPRESSED_POINTER_FIELD(TypedDataPtr, line_starts) #if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME) COMPRESSED_POINTER_FIELD(ExternalTypedDataPtr, constant_coverage) @@ -1594,11 +1593,11 @@ class alignas(8) UntaggedScript : public UntaggedObject { #endif #if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME) - int64_t load_timestamp_; int32_t kernel_script_index_; + int64_t load_timestamp_; #else - int32_t kernel_script_index_; int64_t load_timestamp_; + int32_t kernel_script_index_; #endif }; diff --git a/runtime/vm/raw_object_fields.cc b/runtime/vm/raw_object_fields.cc index 629d62b3f03..1b09c409c88 100644 --- a/runtime/vm/raw_object_fields.cc +++ b/runtime/vm/raw_object_fields.cc @@ -43,7 +43,6 @@ namespace dart { F(Field, host_offset_or_field_id_) \ F(Script, url_) \ F(Script, resolved_url_) \ - F(Script, compile_time_constants_) \ F(Script, line_starts_) \ F(Script, debug_positions_) \ F(Script, kernel_program_info_) \