commit 88d81e035cc385f082452a5b7029a48e9c038cf4
author Nicolas Geoffray <ngeoffray@google.com> Sun Aug 07 14:48:09 2022 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon Aug 08 10:17:34 2022 +0000
tree dccf3072387126fdeff4f94bcd0235d58f6f56e3
parent 9bda94d5909a3be51e956cf3f22d65378885334a

Add isInitializing check in nterp header.

This simplifies Instrumentation::GetCodeForInvoke and will be consistent
with the code we generate for AOT in:
https://android-review.googlesource.com/c/platform/art/+/2163021

Bug: 162110941
Test: test.py
Change-Id: Ic4d7747c7729df1281a2ab309589005c41542a31

tools/cpp-define-generator/mirror_class.def

diff --git a/tools/cpp-define-generator/mirror_class.def b/tools/cpp-define-generator/mirror_class.def
index c01aab3..af396bf 100644
--- a/tools/cpp-define-generator/mirror_class.def
+++ b/tools/cpp-define-generator/mirror_class.def
@@ -56,3 +56,8 @@
 ASM_DEFINE(MIRROR_CLASS_IS_VISIBLY_INITIALIZED_VALUE,
            art::enum_cast<uint32_t>(art::ClassStatus::kVisiblyInitialized) <<
                (art::SubtypeCheckBits::BitStructSizeOf() % art::kBitsPerByte))
+ASM_DEFINE(MIRROR_CLASS_IS_INITIALIZING_VALUE,
+           art::enum_cast<uint32_t>(art::ClassStatus::kInitializing) <<
+               (art::SubtypeCheckBits::BitStructSizeOf() % art::kBitsPerByte))
+ASM_DEFINE(MIRROR_CLASS_CLINIT_THREAD_ID_OFFSET,
+           art::mirror::Class::ClinitThreadIdOffset().Int32Value())

tools/cpp-define-generator/thread.def

diff --git a/tools/cpp-define-generator/thread.def b/tools/cpp-define-generator/thread.def
index d796542..97033fc 100644
--- a/tools/cpp-define-generator/thread.def
+++ b/tools/cpp-define-generator/thread.def
@@ -71,3 +71,5 @@
            art::Thread::ReadBarrierMarkEntryPointsOffset<art::kRuntimePointerSize>(0))
 ASM_DEFINE(THREAD_SHARED_METHOD_HOTNESS_OFFSET,
            art::Thread::SharedMethodHotnessOffset<art::kRuntimePointerSize>().Int32Value())
+ASM_DEFINE(THREAD_TID_OFFSET,
+           art::Thread::TidOffset<art::kRuntimePointerSize>().Int32Value())