[vmkit-commits] [vmkit] r56150 - /vmkit/branches/isolate/lib/JnJVM/VMCore/JavaConstantPool.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Sep 12 08:50:56 2008
New Revision: 56150

URL: http://llvm.org/viewvc/llvm-project?rev=56150&view=rev
Log:
Better assertions.


Modified:
    vmkit/branches/isolate/lib/JnJVM/VMCore/JavaConstantPool.cpp

Modified: vmkit/branches/isolate/lib/JnJVM/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/isolate/lib/JnJVM/VMCore/JavaConstantPool.cpp?rev=56150&r1=56149&r2=56150&view=diff

==============================================================================
--- vmkit/branches/isolate/lib/JnJVM/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/branches/isolate/lib/JnJVM/VMCore/JavaConstantPool.cpp Fri Sep 12 08:50:56 2008
@@ -436,7 +436,8 @@
   assert(sign && "No cached signature after JITting");
   utf8 = UTF8At(ctpDef[ntIndex] >> 16);
   cl = loadClass(entry >> 16);
-  assert(cl && cl->isResolved() && "No class after loadClass");
+  assert(cl && "No class after loadClass");
+  assert(cl->isResolved() && "Class not resolved after loadClass");
 }
   
 void JavaConstantPool::resolveField(uint32 index, CommonClass*& cl,
@@ -447,7 +448,8 @@
   assert(sign && "No cached Typedef after JITting");
   utf8 = UTF8At(ctpDef[ntIndex] >> 16);
   cl = loadClass(entry >> 16);
-  assert(cl && cl->isResolved() && "No class after loadClass");
+  assert(cl && "No class after loadClass");
+  assert(cl->isResolved() && "Class not resolved after loadClass");
 }
 
 JavaField* JavaConstantPool::lookupField(uint32 index, bool stat) {