diff options
Diffstat (limited to 'runtime/fault_handler.cc')
| -rw-r--r-- | runtime/fault_handler.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc index c3a962737f..5b31b3aa4b 100644 --- a/runtime/fault_handler.cc +++ b/runtime/fault_handler.cc @@ -20,6 +20,7 @@ #include <sys/mman.h> #include <sys/ucontext.h> +#include "art_code.h" #include "art_method-inl.h" #include "base/stl_util.h" #include "mirror/class.h" @@ -359,16 +360,17 @@ bool FaultManager::IsInGeneratedCode(siginfo_t* siginfo, void* context, bool che return false; } + ArtCode art_code(method_obj); + // We can be certain that this is a method now. Check if we have a GC map // at the return PC address. if (true || kIsDebugBuild) { VLOG(signals) << "looking for dex pc for return pc " << std::hex << return_pc; - const void* code = Runtime::Current()->GetInstrumentation()->GetQuickCodeFor(method_obj, - sizeof(void*)); - uint32_t sought_offset = return_pc - reinterpret_cast<uintptr_t>(code); + uint32_t sought_offset = return_pc - + reinterpret_cast<uintptr_t>(art_code.GetQuickOatEntryPoint(sizeof(void*))); VLOG(signals) << "pc offset: " << std::hex << sought_offset; } - uint32_t dexpc = method_obj->ToDexPc(return_pc, false); + uint32_t dexpc = art_code.ToDexPc(return_pc, false); VLOG(signals) << "dexpc: " << dexpc; return !check_dex_pc || dexpc != DexFile::kDexNoIndex; } @@ -404,9 +406,8 @@ JavaStackTraceHandler::JavaStackTraceHandler(FaultManager* manager) : FaultHandl manager_->AddHandler(this, false); } -bool JavaStackTraceHandler::Action(int sig, siginfo_t* siginfo, void* context) { +bool JavaStackTraceHandler::Action(int sig ATTRIBUTE_UNUSED, siginfo_t* siginfo, void* context) { // Make sure that we are in the generated code, but we may not have a dex pc. - UNUSED(sig); #ifdef TEST_NESTED_SIGNAL bool in_generated_code = true; #else |