Fix incorrect use of explicit super type when calling indirect super …

…methods.
leibnitz27 · Jul 18, 2019 · d57cc09 · d57cc09
1 parent 65a5665
commit d57cc09
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/org/benf/cfr/reader/bytecode/analysis/opgraph/Op02WithProcessedDataAndRefs.java b/src/org/benf/cfr/reader/bytecode/analysis/opgraph/Op02WithProcessedDataAndRefs.java
@@ -339,8 +339,13 @@ private Statement buildInvoke(Method thisCallerMethod) {
         boolean superOnInterface = false;
         if (isSuper) {
             JavaTypeInstance superContainer = function.getClassEntry().getTypeInstance().getDeGenerifiedType();
-            JavaTypeInstance baseType = thisCallerMethod.getClassFile().getBaseClassType().getDeGenerifiedType();
-            superOnInterface = !baseType.equals(superContainer);
+            if (superContainer instanceof JavaRefTypeInstance) {
+                ClassFile classFile = ((JavaRefTypeInstance) superContainer).getClassFile();
+                if (classFile != null && classFile.isInterface()) {
+                    JavaTypeInstance baseType = thisCallerMethod.getClassFile().getBaseClassType().getDeGenerifiedType();
+                    superOnInterface = !baseType.equals(superContainer);
+                }
+            }
         }
 
         JavaTypeInstance bestType = object.getInferredJavaType().getJavaTypeInstance();