diff options
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 277bda4dcc..0003e72428 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -20,7 +20,6 @@ #include "common_throws.h" #include "interpreter_common.h" -#include "interpreter_goto_table_impl.h" #include "interpreter_mterp_impl.h" #include "interpreter_switch_impl.h" #include "mirror/string-inl.h" @@ -231,15 +230,12 @@ static void InterpreterJni(Thread* self, ArtMethod* method, const StringPiece& s enum InterpreterImplKind { kSwitchImplKind, // Switch-based interpreter implementation. - kComputedGotoImplKind, // Computed-goto-based interpreter implementation. kMterpImplKind // Assembly interpreter }; static std::ostream& operator<<(std::ostream& os, const InterpreterImplKind& rhs) { os << ((rhs == kSwitchImplKind) ? "Switch-based interpreter" - : (rhs == kComputedGotoImplKind) - ? "Computed-goto-based interpreter" - : "Asm interpreter"); + : "Asm interpreter"); return os; } @@ -323,7 +319,8 @@ static inline JValue Execute( } } } - } else if (kInterpreterImplKind == kSwitchImplKind) { + } else { + DCHECK_EQ(kInterpreterImplKind, kSwitchImplKind); if (transaction_active) { return ExecuteSwitchImpl<false, true>(self, code_item, shadow_frame, result_register, false); @@ -331,13 +328,6 @@ static inline JValue Execute( return ExecuteSwitchImpl<false, false>(self, code_item, shadow_frame, result_register, false); } - } else { - DCHECK_EQ(kInterpreterImplKind, kComputedGotoImplKind); - if (transaction_active) { - return ExecuteGotoImpl<false, true>(self, code_item, shadow_frame, result_register); - } else { - return ExecuteGotoImpl<false, false>(self, code_item, shadow_frame, result_register); - } } } else { // Enter the "with access check" interpreter. @@ -350,7 +340,8 @@ static inline JValue Execute( return ExecuteSwitchImpl<true, false>(self, code_item, shadow_frame, result_register, false); } - } else if (kInterpreterImplKind == kSwitchImplKind) { + } else { + DCHECK_EQ(kInterpreterImplKind, kSwitchImplKind); if (transaction_active) { return ExecuteSwitchImpl<true, true>(self, code_item, shadow_frame, result_register, false); @@ -358,13 +349,6 @@ static inline JValue Execute( return ExecuteSwitchImpl<true, false>(self, code_item, shadow_frame, result_register, false); } - } else { - DCHECK_EQ(kInterpreterImplKind, kComputedGotoImplKind); - if (transaction_active) { - return ExecuteGotoImpl<true, true>(self, code_item, shadow_frame, result_register); - } else { - return ExecuteGotoImpl<true, false>(self, code_item, shadow_frame, result_register); - } } } } |