diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 09:37:21 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 10:47:02 -0800 |
| commit | e5f13e57ff8fa36342beb33830b3ec5942a61cca (patch) | |
| tree | 02e370ecc4e0d955f28bfc71a41015f94fbb19b7 /runtime/utils.cc | |
| parent | 354d58ba776866ea7b1c71f0d0848d5aaa013ae3 (diff) | |
| download | art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.tar.gz art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.tar.bz2 art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.zip | |
Revert "Revert "Add JIT""
Added missing EntryPointToCodePointer.
This reverts commit a5ca888d715cd0c6c421313211caa1928be3e399.
Change-Id: Ia74df0ef3a7babbdcb0466fd24da28e304e3f5af
Diffstat (limited to 'runtime/utils.cc')
| -rw-r--r-- | runtime/utils.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/utils.cc b/runtime/utils.cc index 85c9340d0..dea8f7939 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -1262,9 +1262,9 @@ void DumpNativeStack(std::ostream& os, pid_t tid, const char* prefix, os << "+" << it->func_offset; } try_addr2line = true; - } else if (current_method != nullptr && - Locks::mutator_lock_->IsSharedHeld(Thread::Current()) && - current_method->PcIsWithinQuickCode(it->pc)) { + } else if ( + current_method != nullptr && Locks::mutator_lock_->IsSharedHeld(Thread::Current()) && + current_method->PcIsWithinQuickCode(it->pc)) { const void* start_of_code = current_method->GetEntryPointFromQuickCompiledCode(); os << JniLongName(current_method) << "+" << (it->pc - reinterpret_cast<uintptr_t>(start_of_code)); |