diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-14 17:41:57 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-16 19:27:28 -0700 |
| commit | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (patch) | |
| tree | f7a20779e4d665f948c5fbcd26dac0071dafb8d4 /runtime/quick_exception_handler.cc | |
| parent | 2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4 (diff) | |
Make ART compile with GCC -O0 again.
Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on
architecture.
Add to instruction_set_test to warn when InstructionSetFeatures don't agree
with ones from system properties, AT_HWCAP and /proc/cpuinfo.
Clean-up class linker entry point logic to not return entry points but to
test whether the passed code is the particular entrypoint. This works around
image trampolines that replicate entrypoints.
Bug: 17993736
Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index 2c158ba963..8e578374c0 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -19,6 +19,7 @@ #include "arch/context.h" #include "dex_instruction.h" #include "entrypoints/entrypoint_utils.h" +#include "entrypoints/runtime_asm_entrypoints.h" #include "handle_scope-inl.h" #include "mirror/art_method-inl.h" #include "mirror/class-inl.h" @@ -96,7 +97,7 @@ class CatchBlockStackVisitor FINAL : public StackVisitor { if (found_dex_pc != DexFile::kDexNoIndex) { exception_handler_->SetHandlerMethod(method.Get()); exception_handler_->SetHandlerDexPc(found_dex_pc); - exception_handler_->SetHandlerQuickFramePc(method->ToNativePc(found_dex_pc)); + exception_handler_->SetHandlerQuickFramePc(method->ToNativeQuickPc(found_dex_pc)); exception_handler_->SetHandlerQuickFrame(GetCurrentQuickFrame()); return false; // End stack walk. } @@ -308,7 +309,7 @@ class InstrumentationStackVisitor : public StackVisitor { size_t current_frame_depth = GetFrameDepth(); if (current_frame_depth < frame_depth_) { CHECK(GetMethod() != nullptr); - if (UNLIKELY(GetQuickInstrumentationExitPc() == GetReturnPc())) { + if (UNLIKELY(reinterpret_cast<uintptr_t>(GetQuickInstrumentationExitPc()) == GetReturnPc())) { ++instrumentation_frames_to_pop_; } return true; |