commit 93455a0a43f16bc7f7ece7ba196c411f01c28b2f
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 05 15:17:22 2022 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Sep 15 13:47:45 2022 +0000
tree 5476c4a4015382a171e6326b4a766d1e865ca178
parent 5aeed7f22b072c42079668af31a08df4ecb94a57

Reland "Add isInitializing check in nterp header."

This reverts commit 2432d6bb2f7e105ba80f0b95f726621944cb1bc0.

Bug: 162110941

Reason for revert: Add a IsInitialized check to avoid busy looping
between the interpreter and the resolution trampoline.

Change-Id: I4d61bd10f73e1e9ee1ff7215872485915bf0874f

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 af396bf..062a7aa 100644
--- a/tools/cpp-define-generator/mirror_class.def
+++ b/tools/cpp-define-generator/mirror_class.def
@@ -59,5 +59,8 @@
 ASM_DEFINE(MIRROR_CLASS_IS_INITIALIZING_VALUE,
            art::enum_cast<uint32_t>(art::ClassStatus::kInitializing) <<
                (art::SubtypeCheckBits::BitStructSizeOf() % art::kBitsPerByte))
+ASM_DEFINE(MIRROR_CLASS_IS_INITIALIZED_VALUE,
+           art::enum_cast<uint32_t>(art::ClassStatus::kInitialized) <<
+               (art::SubtypeCheckBits::BitStructSizeOf() % art::kBitsPerByte))
 ASM_DEFINE(MIRROR_CLASS_CLINIT_THREAD_ID_OFFSET,
            art::mirror::Class::ClinitThreadIdOffset().Int32Value())