[vmkit-commits] [vmkit] r56149 - /vmkit/branches/isolate/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp.inc

[Nicolas Geoffray]

Author: geoffray
Date: Fri Sep 12 08:48:12 2008
New Revision: 56149

URL: http://llvm.org/viewvc/llvm-project?rev=56149&view=rev
Log:
Include exceptions constructor in the stacktrace (for now).


Modified:
    vmkit/branches/isolate/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp.inc

Modified: vmkit/branches/isolate/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/isolate/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp.inc?rev=56149&r1=56148&r2=56149&view=diff

==============================================================================
--- vmkit/branches/isolate/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp.inc (original)
+++ vmkit/branches/isolate/lib/JnJVM/Classpath/ClasspathVMThrowable.cpp.inc Fri Sep 12 08:48:12 2008
@@ -47,7 +47,6 @@
 }
 
 
-#ifndef MULTIPLE_VM
 JavaObject* consStackElement(JavaMethod* meth, int* ip) {
   Jnjvm* vm = JavaThread::get()->isolate;
   JavaObject* methodName = vm->UTF8ToStr(meth->name);
@@ -102,7 +101,11 @@
   
   while (stack[i] != 0) {
     JavaMethod* meth = JavaJIT::IPToJavaMethod(stack[i++]);
+#ifdef MULTIPLE_VM
+    if (meth) {
+#else
     if (meth && !meth->classDef->subclassOf(vm->upcalls->newThrowable)) {
+#endif
       first = i - 1;
       break;
     }
@@ -112,6 +115,5 @@
   return res;
 }
 
-#endif
 }