commit e81f10a3f672a8bcc421cab812e6435749181566
author David Srbecky <dsrbecky@google.com> Thu Jul 04 10:00:12 2019 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 05 00:20:19 2019 +0000
tree 076df5318e4bfdb6148fd6bb0faf5ea8de1d3336
parent 9690542a9ed7740110459d3167708e6edc1a2686

Revert "Remove ShadowFrame::dex_pc_ (but keep dex_pc_ptr_)"

This reverts commit 50bc8fb89c79874e731f245abda3b9e48a541cfe.

Reason for revert: Performance regression

Change-Id: Ib39ceb9e1f2753c518dd24fd193a824211fd5795

runtime/interpreter/shadow_frame.h

diff --git a/runtime/interpreter/shadow_frame.h b/runtime/interpreter/shadow_frame.h
index b0fa4a3..8cb2b33 100644
--- a/runtime/interpreter/shadow_frame.h
+++ b/runtime/interpreter/shadow_frame.h
@@ -21,10 +21,8 @@
 #include <cstring>
 #include <string>
 
-#include "art_method.h"
 #include "base/locks.h"
 #include "base/macros.h"
-#include "dex/code_item_accessors-inl.h"
 #include "lock_count_data.h"
 #include "read_barrier.h"
 #include "stack_reference.h"
@@ -104,7 +102,7 @@
   }
 
   uint32_t GetDexPC() const {
-    return (dex_pc_ptr_ == nullptr) ? dex::kDexNoIndex : (dex_pc_ptr_ - dex_instructions_);
+    return (dex_pc_ptr_ == nullptr) ? dex_pc_ : dex_pc_ptr_ - dex_instructions_;
   }
 
   int16_t GetCachedHotnessCountdown() const {
@@ -124,7 +122,8 @@
   }
 
   void SetDexPC(uint32_t dex_pc) {
-    dex_pc_ptr_ = (dex_pc == dex::kDexNoIndex) ? nullptr : (dex_instructions_ + dex_pc);
+    dex_pc_ = dex_pc;
+    dex_pc_ptr_ = nullptr;
   }
 
   ShadowFrame* GetLink() const {
@@ -281,6 +280,10 @@
     return OFFSETOF_MEMBER(ShadowFrame, method_);
   }
 
+  static constexpr size_t DexPCOffset() {
+    return OFFSETOF_MEMBER(ShadowFrame, dex_pc_);
+  }
+
   static constexpr size_t NumberOfVRegsOffset() {
     return OFFSETOF_MEMBER(ShadowFrame, number_of_vregs_);
   }
@@ -297,6 +300,10 @@
     return OFFSETOF_MEMBER(ShadowFrame, dex_pc_ptr_);
   }
 
+  static constexpr size_t DexInstructionsOffset() {
+    return OFFSETOF_MEMBER(ShadowFrame, dex_instructions_);
+  }
+
   static constexpr size_t CachedHotnessCountdownOffset() {
     return OFFSETOF_MEMBER(ShadowFrame, cached_hotness_countdown_);
   }
@@ -382,9 +389,10 @@
       : link_(link),
         method_(method),
         result_register_(nullptr),
-        dex_instructions_(method == nullptr ? nullptr : method->DexInstructionData().Insns()),
-        dex_pc_ptr_(dex_instructions_ + dex_pc),
+        dex_pc_ptr_(nullptr),
+        dex_instructions_(nullptr),
         number_of_vregs_(num_vregs),
+        dex_pc_(dex_pc),
         cached_hotness_countdown_(0),
         hotness_countdown_(0),
         frame_flags_(0) {
@@ -417,10 +425,12 @@
   ShadowFrame* link_;
   ArtMethod* method_;
   JValue* result_register_;
-  const uint16_t* dex_instructions_;  // Dex instruction base of the code item.
   const uint16_t* dex_pc_ptr_;
+  // Dex instruction base of the code item.
+  const uint16_t* dex_instructions_;
   LockCountData lock_count_data_;  // This may contain GC roots when lock counting is active.
   const uint32_t number_of_vregs_;
+  uint32_t dex_pc_;
   int16_t cached_hotness_countdown_;
   int16_t hotness_countdown_;