[vmkit-commits] [vmkit] r142374 - /vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp

[Will Dietz]

Author: wdietz2
Date: Tue Oct 18 12:42:46 2011
New Revision: 142374

URL: http://llvm.org/viewvc/llvm-project?rev=142374&view=rev
Log:
Fix assert in JavaConstantPool when resolving methods on Array classes.

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

Modified: vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp?rev=142374&r1=142373&r2=142374&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp Tue Oct 18 12:42:46 2011
@@ -476,7 +476,7 @@
   utf8 = UTF8At(ctpDef[ntIndex] >> 16);
   cl = loadClass(entry >> 16);
   assert(cl && "No class after loadClass");
-  assert((cl->isClass() && cl->asClass()->isResolved()) && 
+  assert((cl->isArray() || (cl->isClass() && cl->asClass()->isResolved())) &&
          "Class not resolved after loadClass");
 }