diff options
| author | Dave Allison <dallison@google.com> | 2014-04-07 19:01:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-07 19:01:40 +0000 |
| commit | 4d3dc8a04da8a80251b381cdb482190363171dc1 (patch) | |
| tree | dff78a37faedcbe9964ba30ed69f8175365e9d7b /runtime | |
| parent | 50ca506e9191c2eafcf9564528712020f9531dc4 (diff) | |
| parent | 081f73e888b3c246cf7635db37b7f1105cf1a2ff (diff) | |
| download | art-4d3dc8a04da8a80251b381cdb482190363171dc1.zip art-4d3dc8a04da8a80251b381cdb482190363171dc1.tar.gz art-4d3dc8a04da8a80251b381cdb482190363171dc1.tar.bz2 | |
Merge "Revert "Use trampolines for calls to helpers""
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/arm/fault_handler_arm.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/runtime/arch/arm/fault_handler_arm.cc b/runtime/arch/arm/fault_handler_arm.cc index 8d1be3c..3bbec71 100644 --- a/runtime/arch/arm/fault_handler_arm.cc +++ b/runtime/arch/arm/fault_handler_arm.cc @@ -154,11 +154,8 @@ bool SuspensionHandler::Action(int sig, siginfo_t* info, void* context) { sc->arm_pc = reinterpret_cast<uintptr_t>(art_quick_implicit_suspend); // Now remove the suspend trigger that caused this fault. - Thread* thread = reinterpret_cast<Thread*>(sc->arm_r9); - DCHECK_EQ(thread, Thread::Current()); - - LOG(DEBUG) << "removed suspend trigger invoking test suspend on thread " << thread; - thread->RemoveSuspendTrigger(); + Thread::Current()->RemoveSuspendTrigger(); + LOG(DEBUG) << "removed suspend trigger invoking test suspend"; return true; } return false; |