From 849d09a81907f16d8ccc6019b8baf86a304b730c Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 21 Nov 2022 16:50:32 +0100 Subject: Split local reference table out of `IndirectReferenceTable`. In preparation for rewriting the representation of local JNI references, split their implementation out of the shared `IndirectReferenceTable` which shall be used only for global and weak global references going forward. Make the new `LocalReferenceTable` always resizable (remove the enum `ResizableCapacity`) and rename the memory mappings for LRT to "local ref table". Remove `IndirectReferenceTable` code that was needed only for local references, make these tables non-resizable. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 172332525 Change-Id: I87f02c93694577d1b577c4114fa86c2cd23b4c97 --- runtime/runtime.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime/runtime.cc') diff --git a/runtime/runtime.cc b/runtime/runtime.cc index e99eaec150..8c4062ee22 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -512,8 +512,8 @@ Runtime::~Runtime() { monitor_pool_ = nullptr; delete class_linker_; class_linker_ = nullptr; - delete small_irt_allocator_; - small_irt_allocator_ = nullptr; + delete small_lrt_allocator_; + small_lrt_allocator_ = nullptr; delete heap_; heap_ = nullptr; delete intern_table_; @@ -1727,7 +1727,7 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { linear_alloc_.reset(CreateLinearAlloc()); startup_linear_alloc_.reset(CreateLinearAlloc()); - small_irt_allocator_ = new SmallIrtAllocator(); + small_lrt_allocator_ = new jni::SmallLrtAllocator(); BlockSignals(); InitPlatformSignalHandlers(); -- cgit v1.2.3-59-g8ed1b