diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2014-09-02 15:17:15 +0100 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-09-08 12:15:07 +0100 |
commit | 3946844c34ad965515f677084b07d663d70ad1b8 (patch) | |
tree | 0d85bfba2ff69c34a2897351d1e50a1464509305 /runtime/stack.cc | |
parent | e2c23739c6395a83b30ece38f8a2e9e1bf7cf3ce (diff) | |
download | art-3946844c34ad965515f677084b07d663d70ad1b8.zip art-3946844c34ad965515f677084b07d663d70ad1b8.tar.gz art-3946844c34ad965515f677084b07d663d70ad1b8.tar.bz2 |
Runtime support for the new stack maps for the opt compiler.
Now most of the methods supported by the compiler can be optimized,
instead of using the baseline.
Change-Id: I80ab36a34913fa4e7dd576c7bf55af63594dc1fa
Diffstat (limited to 'runtime/stack.cc')
-rw-r--r-- | runtime/stack.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index 2d0060e..b8b10d2 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -115,18 +115,22 @@ uint32_t StackVisitor::GetDexPc(bool abort_on_failure) const { mirror::Object* StackVisitor::GetThisObject() const { mirror::ArtMethod* m = GetMethod(); if (m->IsStatic()) { - return NULL; + return nullptr; } else if (m->IsNative()) { - if (cur_quick_frame_ != NULL) { + if (cur_quick_frame_ != nullptr) { HandleScope* hs = reinterpret_cast<HandleScope*>( reinterpret_cast<char*>(cur_quick_frame_) + m->GetHandleScopeOffsetInBytes()); return hs->GetReference(0); } else { return cur_shadow_frame_->GetVRegReference(0); } + } else if (m->IsOptimized()) { + // TODO: Implement, currently only used for exceptions when jdwp is enabled. + LOG(WARNING) << "StackVisitor::GetThisObject is unimplemented with the optimizing compiler"; + return nullptr; } else { const DexFile::CodeItem* code_item = m->GetCodeItem(); - if (code_item == NULL) { + if (code_item == nullptr) { UNIMPLEMENTED(ERROR) << "Failed to determine this object of abstract or proxy method: " << PrettyMethod(m); return nullptr; |