From fb1b08cbb9c6ac149d75de16c14fdaa8b68baaa4 Mon Sep 17 00:00:00 2001
From: Mythri Alle <mythria@google.com>
Date: Thu, 12 May 2022 15:59:11 +0000
Subject: Revert "Reland^2 "Don't use AOT code for native methods for java
 debuggable runtime""

This reverts commit 5da52cd20ea0d24b038ae20c6c96aa22ac3a24a0.

Reason for revert: https://ci.chromium.org/ui/p/art/builders/ci/host-x86_64-cdex-fast/5172/overview

Change-Id: I9cebbaa145810547531a90af9da7961c0b6255d1
---
 runtime/managed_stack.h | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'runtime/managed_stack.h')

diff --git a/runtime/managed_stack.h b/runtime/managed_stack.h
index 2184f477f8..04a27fe656 100644
--- a/runtime/managed_stack.h
+++ b/runtime/managed_stack.h
@@ -75,12 +75,8 @@ class PACKED(4) ManagedStack {
     return tagged_top_quick_frame_.GetSp();
   }
 
-  bool GetTopQuickFrameGenericJniTag() const {
-    return tagged_top_quick_frame_.GetGenericJniTag();
-  }
-
-  bool GetTopQuickFrameJitJniTag() const {
-    return tagged_top_quick_frame_.GetJitJniTag();
+  bool GetTopQuickFrameTag() const {
+    return tagged_top_quick_frame_.GetTag();
   }
 
   bool HasTopQuickFrame() const {
@@ -93,10 +89,10 @@ class PACKED(4) ManagedStack {
     tagged_top_quick_frame_ = TaggedTopQuickFrame::CreateNotTagged(top);
   }
 
-  void SetTopQuickFrameGenericJniTagged(ArtMethod** top) {
+  void SetTopQuickFrameTagged(ArtMethod** top) {
     DCHECK(top_shadow_frame_ == nullptr);
     DCHECK_ALIGNED(top, 4u);
-    tagged_top_quick_frame_ = TaggedTopQuickFrame::CreateGenericJniTagged(top);
+    tagged_top_quick_frame_ = TaggedTopQuickFrame::CreateTagged(top);
   }
 
   static constexpr size_t TaggedTopQuickFrameOffset() {
@@ -133,30 +129,26 @@ class PACKED(4) ManagedStack {
       return TaggedTopQuickFrame(reinterpret_cast<uintptr_t>(sp));
     }
 
-    static TaggedTopQuickFrame CreateGenericJniTagged(ArtMethod** sp) {
+    static TaggedTopQuickFrame CreateTagged(ArtMethod** sp) {
       DCHECK_ALIGNED(sp, 4u);
       return TaggedTopQuickFrame(reinterpret_cast<uintptr_t>(sp) | 1u);
     }
 
     // Get SP known to be not tagged and non-null.
     ArtMethod** GetSpKnownNotTagged() const {
-      DCHECK(!GetGenericJniTag() && !GetJitJniTag());
+      DCHECK(!GetTag());
       DCHECK_NE(tagged_sp_, 0u);
       return reinterpret_cast<ArtMethod**>(tagged_sp_);
     }
 
     ArtMethod** GetSp() const {
-      return reinterpret_cast<ArtMethod**>(tagged_sp_ & ~static_cast<uintptr_t>(3u));
+      return reinterpret_cast<ArtMethod**>(tagged_sp_ & ~static_cast<uintptr_t>(1u));
     }
 
-    bool GetGenericJniTag() const {
+    bool GetTag() const {
       return (tagged_sp_ & 1u) != 0u;
     }
 
-    bool GetJitJniTag() const {
-      return (tagged_sp_ & 2u) != 0u;
-    }
-
     uintptr_t GetTaggedSp() const {
       return tagged_sp_;
     }
-- 
cgit v1.2.3-59-g8ed1b