From fc9555dac51a3cf12bb13f4e3781d2f2f6c9f91f Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Sun, 5 Nov 2017 16:32:19 -0800
Subject: Remove mterp reliance on code item layout

Pass dex instruction pointer intead of code item pointer to the mterp
entry code. This removes a dependency on the code item layout since it
may change in the future for compact dex.

Bug: 63756964
Test: test/testrunner/testrunner.py --host -j40

Change-Id: Icfffb2e17372439f0833ecce1c0ddb05e7e7e69c
---
 runtime/interpreter/interpreter.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'runtime/interpreter/interpreter.cc')

diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc
index 038405eebc..01b7d4e457 100644
--- a/runtime/interpreter/interpreter.cc
+++ b/runtime/interpreter/interpreter.cc
@@ -314,7 +314,10 @@ static inline JValue Execute(
             return ExecuteSwitchImpl<false, false>(self, code_item, shadow_frame, result_register,
                                                    false);
           }
-          bool returned = ExecuteMterpImpl(self, code_item, &shadow_frame, &result_register);
+          bool returned = ExecuteMterpImpl(self,
+                                           code_item->insns_,
+                                           &shadow_frame,
+                                           &result_register);
           if (returned) {
             return result_register;
           } else {
-- 
cgit v1.2.3-59-g8ed1b