commit c2632ac7512d21407f86c10c8160854e4ff9466f
author Mythri Alle <mythria@google.com> Fri May 13 14:37:52 2022 +0000
committer Mythri Alle <mythria@google.com> Sat May 14 15:47:58 2022 +0000
tree 4cf46647f89784249b11b7f82426522acfef17cd
parent 84707fc83ec59bae46251b298beb819acc7deb23

Reland^3 "Don't use AOT code for native methods for java debuggable runtime"

This reverts commit fb1b08cbb9c6ac149d75de16c14fdaa8b68baaa4.

Reason for revert: Reland after a fix. We had to update untagging in jni_dlsym_lookup_stub as well.

Change-Id: Id936e9e60f9e87e96f1a9a79cd2118631ad1616b

tools/cpp-define-generator/globals.def

diff --git a/tools/cpp-define-generator/globals.def b/tools/cpp-define-generator/globals.def
index 8dcc023..459e5a8 100644
--- a/tools/cpp-define-generator/globals.def
+++ b/tools/cpp-define-generator/globals.def
@@ -86,3 +86,8 @@
 ASM_DEFINE(CALLEE_SAVE_EVERYTHING_NUM_CORE_SPILLS,
            art::POPCOUNT(art::RuntimeCalleeSaveFrame::GetCoreSpills(
                art::CalleeSaveType::kSaveEverything)))
+ASM_DEFINE(TAGGED_JNI_SP_MASK, art::ManagedStack::kTaggedJniSpMask)
+ASM_DEFINE(TAGGED_JNI_SP_MASK_TOGGLED32,
+           ~static_cast<uint32_t>(art::ManagedStack::kTaggedJniSpMask))
+ASM_DEFINE(TAGGED_JNI_SP_MASK_TOGGLED64,
+           ~static_cast<uint64_t>(art::ManagedStack::kTaggedJniSpMask))