[vmkit-commits] [vmkit] r102308 - /vmkit/trunk/lib/J3/VMCore/JavaClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Apr 25 13:34:26 2010
New Revision: 102308

URL: http://llvm.org/viewvc/llvm-project?rev=102308&view=rev
Log:
Also look at super in lookupInterface.


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

Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=102308&r1=102307&r2=102308&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Sun Apr 25 13:34:26 2010
@@ -352,13 +352,16 @@
 JavaMethod* Class::lookupInterfaceMethodDontThrow(const UTF8* name,
                                                   const UTF8* type) {
   JavaMethod* cur = lookupMethodDontThrow(name, type, false, false, 0);
-  if (!cur) {
+  if (cur == NULL) {
     for (uint16 i = 0; i < nbInterfaces; ++i) {
       Class* I = interfaces[i];
       cur = I->lookupInterfaceMethodDontThrow(name, type);
       if (cur) return cur;
     }
   }
+  if (cur == NULL && super != NULL) {
+    cur = super->lookupInterfaceMethodDontThrow(name, type);
+  }
   return cur;
 }