diff options
| author | 2017-09-15 11:59:26 -0700 | |
|---|---|---|
| committer | 2017-09-18 11:36:24 -0700 | |
| commit | e2abbc604ce003c776c00ecf1293796bb4c4ac5a (patch) | |
| tree | f7d124d1861cad2162c30dfe932bb4e1beaf41ef /runtime/interpreter/interpreter_switch_impl.cc | |
| parent | 7090dfe84f78b1928fcbdfd664d0dd9ea52633ff (diff) | |
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
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc index 69e091b42d..850419bd9d 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 @@ namespace interpreter { 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 @@ namespace interpreter { 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 @@ JValue ExecuteSwitchImpl(Thread* self, const DexFile::CodeItem* code_item, } 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 @@ JValue ExecuteSwitchImpl(Thread* self, const DexFile::CodeItem* code_item, } 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 @@ JValue ExecuteSwitchImpl(Thread* self, const DexFile::CodeItem* code_item, } 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 @@ JValue ExecuteSwitchImpl(Thread* self, const DexFile::CodeItem* code_item, } 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 @@ JValue ExecuteSwitchImpl(Thread* self, const DexFile::CodeItem* code_item, 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; } |