K2: resolve remove(Int) clash in JavaOverrideChecker
In Kotlin subclasses of `MutableCollection<Int>`, the method `remove(Int)` has its argument boxed, so that it wouldn't clash with the method from `java.util.List`. So `JavaOverrideChecker` should understand that a Java method `boolean remove(java.lang.Integer)` overrides it, otherwise platform declaration clash was reported. The code is adapted from `forceSingleValueParameterBoxing` in K1's `methodSignatureMapping.kt`. The test has been moved and adapted from diagnostic to codegen box tests, to check correct backend execution + runtime. #KT-62316 Fixed
This commit is contained in:
committed by
Space Team
parent
8e023edc4f
commit
2788dcb5ff
+10
@@ -6678,6 +6678,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
|
||||
runTest("compiler/testData/codegen/box/collections/removeAtInt.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("removeAtIntOverrideInJava.kt")
|
||||
public void testRemoveAtIntOverrideInJava() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/collections/removeAtIntOverrideInJava.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("removeAtIntOverrideInJava2.kt")
|
||||
public void testRemoveAtIntOverrideInJava2() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/collections/removeAtIntOverrideInJava2.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("removeClash.kt")
|
||||
public void testRemoveClash() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/collections/removeClash.kt");
|
||||
|
||||
Reference in New Issue
Block a user