[vmkit-commits] [vmkit] r102307 - in /vmkit/trunk/lib/J3/VMCore: JavaTypes.cpp JavaTypes.h

[Nicolas Geoffray]

Author: geoffray
Date: Sun Apr 25 11:32:02 2010
New Revision: 102307

URL: http://llvm.org/viewvc/llvm-project?rev=102307&view=rev
Log:
Array salso may load class with assocClass, so redefine findAssocClass.


Modified:
    vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
    vmkit/trunk/lib/J3/VMCore/JavaTypes.h

Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp?rev=102307&r1=102306&r2=102307&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp Sun Apr 25 11:32:02 2010
@@ -28,6 +28,10 @@
   return loader->lookupClassOrArray(pseudoAssocClassName);
 }
 
+UserCommonClass* ArrayTypedef::findAssocClass(JnjvmClassLoader* loader) const {
+  return loader->lookupClassOrArray(keyName);
+}
+
 Signdef::Signdef(const UTF8* name, JnjvmClassLoader* loader,
                  std::vector<Typedef*>& args, Typedef* ret) {
   

Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.h?rev=102307&r1=102306&r2=102307&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.h Sun Apr 25 11:32:02 2010
@@ -226,6 +226,7 @@
   }
 
   virtual UserCommonClass* assocClass(JnjvmClassLoader* loader) const;
+  virtual UserCommonClass* findAssocClass(JnjvmClassLoader* loader) const;
 
   ArrayTypedef(const UTF8* name) {
     keyName = name;