Don't produce interface forwarders directed at an abstract target

smowton · smowton · commit 50f99d8e827f · 2022-10-18T10:31:01.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -840,7 +840,7 @@ open class KotlinFileExtractor(
         // there to allow default method usage in Java < 8, but this is hopefully niche.
         !pluginContext.languageVersionSettings.getFlag(JvmAnalysisFlags.jvmDefaultMode).forAllMethodsWithBody &&
                 f.parentClassOrNull?.origin != IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB &&
-                f.realOverrideTarget.let { it != f && isKotlinDefinedInterface(it.parentClassOrNull) }
+                f.realOverrideTarget.let { it != f && (it as? IrSimpleFunction)?.modality != Modality.ABSTRACT && isKotlinDefinedInterface(it.parentClassOrNull) }
 
     private fun makeInterfaceForwarder(f: IrFunction, parentId: Label<out DbReftype>, extractBody: Boolean, extractMethodAndParameterTypeAccesses: Boolean, typeSubstitution: TypeSubstitution?, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?) =
         forceExtractFunction(f, parentId, extractBody = false, extractMethodAndParameterTypeAccesses, typeSubstitution, classTypeArgsIncludingOuterClasses, overriddenAttributes = OverriddenFunctionAttributes(visibility = DescriptorVisibilities.PUBLIC)).also { functionId ->
diff --git a/java/ql/test/kotlin/library-tests/inherited-callee/test.expected b/java/ql/test/kotlin/library-tests/inherited-callee/test.expected
@@ -3,7 +3,6 @@
 | Test.java:25:5:25:16 | hashCode(...) | hashCode | Object |
 | Test.java:26:5:26:17 | inheritMe(...) | inheritMe | Test |
 | Test.java:28:5:28:34 | inheritedInterfaceMethodJ(...) | inheritedInterfaceMethodJ | ParentIf |
-| Test.kt:13:1:16:1 | inheritedInterfaceMethodK(...) | inheritedInterfaceMethodK | ParentIf |
 | Test.kt:23:7:23:16 | toString(...) | toString | Object |
 | Test.kt:24:7:24:15 | equals(...) | equals | Object |
 | Test.kt:25:7:25:16 | hashCode(...) | hashCode | Object |
diff --git a/java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.expected b/java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -416,8 +416,6 @@ methodWithDuplicate
 | Map<String,String> | replaceAll | BiFunction<? super String,? super String,? extends String> |
 | MutableCollection | add | E |
 | MutableCollection | addAll | Collection<? extends E> |
-| MutableCollection | contains | Object |
-| MutableCollection | containsAll | Collection<?> |
 | MutableCollection | forEach | Consumer<? super E> |
 | MutableCollection | remove | Object |
 | MutableCollection | removeAll | Collection<?> |
@@ -428,12 +426,7 @@ methodWithDuplicate
 | MutableList | add | int |
 | MutableList | addAll | Collection<? extends E> |
 | MutableList | addAll | int |
-| MutableList | contains | Object |
-| MutableList | containsAll | Collection<?> |
 | MutableList | forEach | Consumer<? super E> |
-| MutableList | get | int |
-| MutableList | indexOf | Object |
-| MutableList | lastIndexOf | Object |
 | MutableList | listIterator | int |
 | MutableList | remove | Object |
 | MutableList | remove | int |
@@ -452,10 +445,7 @@ methodWithDuplicate
 | MutableMap | computeIfAbsent | K |
 | MutableMap | computeIfPresent | BiFunction<? super K,? super V,? extends V> |
 | MutableMap | computeIfPresent | K |
-| MutableMap | containsKey | Object |
-| MutableMap | containsValue | Object |
 | MutableMap | forEach | BiConsumer<? super K,? super V> |
-| MutableMap | get | Object |
 | MutableMap | getOrDefault | Object |
 | MutableMap | getOrDefault | V |
 | MutableMap | merge | BiFunction<? super V,? super V,? extends V> |
diff --git a/java/ql/test/kotlin/library-tests/reflection/reflection.expected b/java/ql/test/kotlin/library-tests/reflection/reflection.expected
