diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-05-11 15:49:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-11 15:49:47 +0000 |
| commit | ee623ea4432a393d0bab6918829356f63c5d8716 (patch) | |
| tree | f4079c570efd8a3bcdc038b676a079d7b2d01e46 /runtime/native | |
| parent | 2a9c047ddc6e411df1dcd8d00ab5a701d530569f (diff) | |
| parent | 1c3243416088c2f2072f6db413cfb3c8bf2dacfb (diff) | |
| download | art-ee623ea4432a393d0bab6918829356f63c5d8716.zip art-ee623ea4432a393d0bab6918829356f63c5d8716.tar.gz art-ee623ea4432a393d0bab6918829356f63c5d8716.tar.bz2 | |
am 1c324341: am 6108ed86: Merge "Add a flag to StackVisitor for inlining."
* commit '1c3243416088c2f2072f6db413cfb3c8bf2dacfb':
Add a flag to StackVisitor for inlining.
Diffstat (limited to 'runtime/native')
| -rw-r--r-- | runtime/native/dalvik_system_VMStack.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc index 17fbc4f..1d7d853 100644 --- a/runtime/native/dalvik_system_VMStack.cc +++ b/runtime/native/dalvik_system_VMStack.cc @@ -84,7 +84,8 @@ static jobject VMStack_getCallingClassLoader(JNIEnv* env, jclass) { static jobject VMStack_getClosestUserClassLoader(JNIEnv* env, jclass) { struct ClosestUserClassLoaderVisitor : public StackVisitor { explicit ClosestUserClassLoaderVisitor(Thread* thread) - : StackVisitor(thread, nullptr), class_loader(nullptr) {} + : StackVisitor(thread, nullptr, StackVisitor::StackWalkKind::kIncludeInlinedFrames), + class_loader(nullptr) {} bool VisitFrame() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { DCHECK(class_loader == nullptr); |