diff options
author | 2024-05-23 07:28:07 +0000 | |
---|---|---|
committer | 2024-06-20 10:50:35 +0000 | |
commit | 7b23aad719b9cc4152355b7cf0fa49b040acd6ab (patch) | |
tree | 8e50f93ef6959b2e6a52e6afe6acb629b3d9cef0 /runtime/class_linker.cc | |
parent | daf65911a4e8126d10a0d98b9e3bcb363d373a30 (diff) |
Replace `ScopedAssertNoNewTransactionRecords`...
... with `ScopedAssertNoTransactionChecks`. The new check
is stronger than the old one but does not work during early
setup when we do not have a `Thread` object yet.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: Iba5a5cda0d97993ff324b4d11de02cb07f770699
Diffstat (limited to 'runtime/class_linker.cc')
-rw-r--r-- | runtime/class_linker.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 4d3eaea37f..72e4d14789 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -148,6 +148,7 @@ #include "profile/profile_compilation_info.h" #include "runtime.h" #include "runtime_callbacks.h" +#include "scoped_assert_no_transaction_checks.h" #include "scoped_thread_state_change-inl.h" #include "startup_completed_task.h" #include "thread-inl.h" @@ -4659,7 +4660,7 @@ ObjPtr<mirror::Class> ClassLinker::CreateArrayClass(Thread* self, auto visitor = [this, array_class_size, component_type](ObjPtr<mirror::Object> obj, size_t usable_size) REQUIRES_SHARED(Locks::mutator_lock_) { - ScopedAssertNoNewTransactionRecords sanntr("CreateArrayClass"); + ScopedAssertNoTransactionChecks santc("CreateArrayClass"); mirror::Class::InitializeClassVisitor init_class(array_class_size); init_class(obj, usable_size); ObjPtr<mirror::Class> klass = ObjPtr<mirror::Class>::DownCast(obj); |