[vmkit-commits] [vmkit] r96247 - /vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Feb 15 12:54:56 2010
New Revision: 96247

URL: http://llvm.org/viewvc/llvm-project?rev=96247&view=rev
Log:
Debug and Release mode do not agree on what is the first
method on the stack. Therefore loop until we found one.


Modified:
    vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp

Modified: vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp?rev=96247&r1=96246&r2=96247&view=diff

==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp Mon Feb 15 12:54:56 2010
@@ -598,9 +598,8 @@
 
   // Lookup the caller of this class.
   mvm::StackWalker Walker(th);
-  ++Walker;
+  while (Walker.get()->MethodType != 1) ++Walker;
   mvm::MethodInfo* MI = Walker.get();
-  assert(MI->MethodType == 1 && "Wrong call to stub");
   JavaMethod* meth = (JavaMethod*)MI->getMetaInfo();
   void* ip = *Walker;
 
@@ -660,7 +659,7 @@
 
   // Lookup the caller of this class.
   mvm::StackWalker Walker(th);
-  ++Walker;
+  while (Walker.get()->MethodType != 1) ++Walker;
   mvm::MethodInfo* MI = Walker.get();
   assert(MI->MethodType == 1 && "Wrong call to stub");
   JavaMethod* caller = (JavaMethod*)MI->getMetaInfo();
@@ -698,7 +697,7 @@
 
   // Lookup the caller of this class.
   mvm::StackWalker Walker(th);
-  ++Walker;
+  while (Walker.get()->MethodType != 1) ++Walker;
   mvm::MethodInfo* MI = Walker.get();
   assert(MI->MethodType == 1 && "Wrong call to stub");
   JavaMethod* caller = (JavaMethod*)MI->getMetaInfo();