[vmkit-commits] [vmkit] r69592 - /vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Apr 20 08:22:41 2009
New Revision: 69592

URL: http://llvm.org/viewvc/llvm-project?rev=69592&view=rev
Log:
Interface arrays always are secondary types.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Mon Apr 20 08:22:41 2009
@@ -1402,6 +1402,7 @@
       }
      
       bool newSecondaryTypes = false;
+      bool intf = temp->isInterface();
       if (temp->isPrimitive()) {
         --dim;
         temp = C->super;
@@ -1419,7 +1420,7 @@
 
       uint32 length = getDisplayLength() < depth ? getDisplayLength() : depth;
       memcpy(display, superVT->display, length * sizeof(JavaVirtualTable*)); 
-      if (depth < getDisplayLength()) {
+      if (depth < getDisplayLength() && !intf) {
         display[depth] = this;
         offset = getCacheIndex() + depth + 1;
       } else {