diff options
Diffstat (limited to 'runtime/interpreter/interpreter_common.h')
| -rw-r--r-- | runtime/interpreter/interpreter_common.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/interpreter/interpreter_common.h b/runtime/interpreter/interpreter_common.h index ce7c1c3817..06b809f028 100644 --- a/runtime/interpreter/interpreter_common.h +++ b/runtime/interpreter/interpreter_common.h @@ -25,6 +25,7 @@ #include <sstream> #include "base/logging.h" +#include "base/macros.h" #include "class_linker-inl.h" #include "common_throws.h" #include "dex_file-inl.h" @@ -349,8 +350,8 @@ uint32_t FindNextInstructionFollowingException(Thread* self, ShadowFrame& shadow uint32_t dex_pc, const instrumentation::Instrumentation* instrumentation) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -void UnexpectedOpcode(const Instruction* inst, const ShadowFrame& shadow_frame) - __attribute__((cold, noreturn)) +NO_RETURN void UnexpectedOpcode(const Instruction* inst, const ShadowFrame& shadow_frame) + __attribute__((cold)) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); static inline void TraceExecution(const ShadowFrame& shadow_frame, const Instruction* inst, |