Skip to content

Commit 343e45e

Browse files
committed
Fix kotlinFunctionToJavaEquivalent to ignore nullability
1 parent e490a85 commit 343e45e

File tree

8 files changed

+1
-10
lines changed

8 files changed

+1
-10
lines changed

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,7 @@ open class KotlinUsesExtractor(
12761276
javaClass.declarations.findSubType<IrFunction> { decl ->
12771277
decl.name.asString() == jvmName &&
12781278
decl.valueParameters.size == f.valueParameters.size &&
1279-
decl.valueParameters.zip(f.valueParameters).all { p -> erase(p.first.type) == erase(p.second.type) }
1279+
decl.valueParameters.zip(f.valueParameters).all { p -> erase(p.first.type).classifierOrNull == erase(p.second.type).classifierOrNull }
12801280
} ?:
12811281
// Or check property accessors:
12821282
(f.propertyIfAccessor as? IrProperty)?.let { kotlinProp ->

java/ql/test/kotlin/library-tests/classes/CONSISTENCY/javaEquivalent.expected

Lines changed: 0 additions & 2 deletions
This file was deleted.

java/ql/test/kotlin/library-tests/comments/CONSISTENCY/javaEquivalent.expected

Lines changed: 0 additions & 1 deletion
This file was deleted.

java/ql/test/kotlin/library-tests/dataflow/func/CONSISTENCY/javaEquivalent.expected

Lines changed: 0 additions & 1 deletion
This file was deleted.

java/ql/test/kotlin/library-tests/exprs/CONSISTENCY/javaEquivalent.expected

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Byte.toInt in java.lang.Byte |
1313
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Byte.toInt in java.lang.Byte |
1414
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Byte.toInt in java.lang.Byte |
15-
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Enum.<init> in java.lang.Enum |
16-
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Enum.<init> in java.lang.Enum |
1715
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Int.and in java.lang.Integer |
1816
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Int.dec in java.lang.Integer |
1917
| file://:0:0:0:0 | Couldn't find a Java equivalent function to kotlin.Int.inv in java.lang.Integer |

java/ql/test/kotlin/library-tests/exprs_typeaccess/CONSISTENCY/javaEquivalent.expected

Lines changed: 0 additions & 1 deletion
This file was deleted.

java/ql/test/kotlin/library-tests/methods/CONSISTENCY/javaEquivalent.expected

Lines changed: 0 additions & 1 deletion
This file was deleted.

java/ql/test/kotlin/library-tests/no-when-branch-found/CONSISTENCY/javaEquivalent.expected

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)