commit e2abbc604ce003c776c00ecf1293796bb4c4ac5a
author Andreas Gampe <agampe@google.com> Fri Sep 15 11:59:26 2017 -0700
committer Andreas Gampe <agampe@google.com> Mon Sep 18 11:36:24 2017 -0700
tree f7d124d1861cad2162c30dfe932bb4e1beaf41ef
parent 7090dfe84f78b1928fcbdfd664d0dd9ea52633ff

ART: Move kDexNoIndex to dex_file_types.h

Define the constant with the types to allow lowering the dependency
on DexFile.

Test: m
Change-Id: I3c61421db45be96d2057e01b1a7825883d8bd178

runtime/interpreter/interpreter_switch_impl.cc

diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc
index 69e091b..850419b 100644
--- a/runtime/interpreter/interpreter_switch_impl.cc
+++ b/runtime/interpreter/interpreter_switch_impl.cc
@@ -17,6 +17,7 @@
 #include "interpreter_switch_impl.h"
 
 #include "base/enums.h"
+#include "dex_file_types.h"
 #include "experimental_flags.h"
 #include "interpreter_common.h"
 #include "jit/jit.h"
@@ -35,7 +36,7 @@
       DoMonitorCheckOnExit<do_assignability_check>(self, &shadow_frame);                        \
       if (interpret_one_instruction) {                                                          \
         /* Signal mterp to return to caller */                                                  \
-        shadow_frame.SetDexPC(DexFile::kDexNoIndex);                                            \
+        shadow_frame.SetDexPC(dex::kDexNoIndex);                                                \
       }                                                                                         \
       return JValue(); /* Handled in caller. */                                                 \
     } else {                                                                                    \
@@ -88,7 +89,7 @@
     if (jit::Jit::MaybeDoOnStackReplacement(self, method, dex_pc, offset, &result)) {          \
       if (interpret_one_instruction) {                                                         \
         /* OSR has completed execution of the method.  Signal mterp to return to caller */     \
-        shadow_frame.SetDexPC(DexFile::kDexNoIndex);                                           \
+        shadow_frame.SetDexPC(dex::kDexNoIndex);                                               \
       }                                                                                        \
       return result;                                                                           \
     }                                                                                          \
@@ -303,7 +304,7 @@
         }
         if (interpret_one_instruction) {
           /* Signal mterp to return to caller */
-          shadow_frame.SetDexPC(DexFile::kDexNoIndex);
+          shadow_frame.SetDexPC(dex::kDexNoIndex);
         }
         return result;
       }
@@ -325,7 +326,7 @@
         }
         if (interpret_one_instruction) {
           /* Signal mterp to return to caller */
-          shadow_frame.SetDexPC(DexFile::kDexNoIndex);
+          shadow_frame.SetDexPC(dex::kDexNoIndex);
         }
         return result;
       }
@@ -348,7 +349,7 @@
         }
         if (interpret_one_instruction) {
           /* Signal mterp to return to caller */
-          shadow_frame.SetDexPC(DexFile::kDexNoIndex);
+          shadow_frame.SetDexPC(dex::kDexNoIndex);
         }
         return result;
       }
@@ -370,7 +371,7 @@
         }
         if (interpret_one_instruction) {
           /* Signal mterp to return to caller */
-          shadow_frame.SetDexPC(DexFile::kDexNoIndex);
+          shadow_frame.SetDexPC(dex::kDexNoIndex);
         }
         return result;
       }
@@ -414,7 +415,7 @@
         result.SetL(shadow_frame.GetVRegReference(ref_idx));
         if (interpret_one_instruction) {
           /* Signal mterp to return to caller */
-          shadow_frame.SetDexPC(DexFile::kDexNoIndex);
+          shadow_frame.SetDexPC(dex::kDexNoIndex);
         }
         return result;
       }