commit 3f9137d85b3c2c0800fb26e3415ace1a6b7cc4de
author TDYa127 <tdy@google.com> Sun Apr 08 15:59:19 2012 -0700
committer Shih-wei Liao <sliao@google.com> Tue Apr 10 04:49:44 2012 -0700
tree 7b2c72c1ccf3512fb52fc48ecfb84f9c5c680a82
parent 6ac6a365a9bdb00e85b46eb8fadfb0cebf653cba

Fix NPE message in LLVM.

Change-Id: Ie65060d065d747a6c9ad22c61d5fb29f6cf3c249

src/dalvik_system_VMStack.cc

diff --git a/src/dalvik_system_VMStack.cc b/src/dalvik_system_VMStack.cc
index 8401ec1..e0862c3 100644
--- a/src/dalvik_system_VMStack.cc
+++ b/src/dalvik_system_VMStack.cc
@@ -47,7 +47,7 @@
 static jobject VMStack_getCallingClassLoader(JNIEnv* env, jclass) {
   NthCallerVisitor visitor(2);
   Thread::Current()->WalkStack(&visitor);
-  return AddLocalReference<jobject>(env, visitor.class_loader);
+  return AddLocalReference<jobject>(env, visitor.caller->GetDeclaringClass()->GetClassLoader());
 }
 
 static jobject VMStack_getClosestUserClassLoader(JNIEnv* env, jclass, jobject javaBootstrap, jobject javaSystem) {
@@ -79,7 +79,7 @@
 static jclass VMStack_getStackClass2(JNIEnv* env, jclass) {
   NthCallerVisitor visitor(3);
   Thread::Current()->WalkStack(&visitor);
-  return AddLocalReference<jclass>(env, visitor.declaring_class);
+  return AddLocalReference<jclass>(env, visitor.caller->GetDeclaringClass());
 }
 
 static jobjectArray VMStack_getThreadStackTrace(JNIEnv* env, jclass, jobject javaThread) {