[vmkit-commits] [vmkit] r79089 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaConstantPool.cpp JnjvmClassLoader.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sat Aug 15 04:53:19 2009
New Revision: 79089

URL: http://llvm.org/viewvc/llvm-project?rev=79089&view=rev
Log:
Output some informative message when a class can not be found
while static compiling.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp?rev=79089&r1=79088&r2=79089&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.cpp Sat Aug 15 04:53:19 2009
@@ -291,6 +291,11 @@
       // Put into ctpRes because there is only one representation of the class
       temp = loader->loadName(name, resolve, false);
     }
+    if (!temp && classDef->classLoader->getCompiler()->isStaticCompiling()) {
+      fprintf(stderr, "Could not find class %s while static compiling\n",
+              UTF8Buffer(name).cString());
+      abort();
+    }
     ctpRes[index] = temp;
   }
 #endif

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=79089&r1=79088&r2=79089&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Sat Aug 15 04:53:19 2009
@@ -427,6 +427,11 @@
       fprintf(stderr, "Unable to load NoClassDefFoundError");
       abort();
     }
+    if (TheCompiler->isStaticCompiling()) {
+      fprintf(stderr, "Could not find %s, needed for static compiling\n",
+              UTF8Buffer(name).cString());
+      abort();
+    }
     vm->noClassDefFoundError(name);
   }