azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Create special hidden override for Java signature clash due to rename

Browse Source 
This fixes CharBuffer.get resolving to CharBuffer.charAt

#KT-61282 Fixed
This commit is contained in:
Kirill Rakhman
2023-11-10 15:59:40 +01:00
committed by Space Team
parent 528a2d3c62
commit 865b8a4175
25 changed files with 498 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/fullJdk/charBuffer.kt
Vendored
-2
View File
@@ -1,6 +1,4 @@
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_K2: JVM_IR
// Ignore reason: KT-61282
// FULL_JDK
import java.nio.CharBuffer
compiler/testData/codegen/box/specialBuiltins/charBuffer.kt
Vendored
+1 -2
View File
@@ -1,6 +1,4 @@
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_K2: JVM_IR
// Ignore reason: KT-61282
// MODULE: lib
// FILE: CharBuffer.java
@@ -34,6 +32,7 @@ public abstract class CharBuffer implements CharSequence {
// MODULE: main(lib)
// FILE: 1.kt
abstract class KCB : CharBuffer()
fun box(): String {
val cb: CharBuffer = CharBuffer.impl()
compiler/testData/codegen/box/specialBuiltins/weirdCharBuffers.kt
Vendored
+142
View File
@@ -0,0 +1,142 @@
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_K1: ANY
// ^KT-63431 CharBufferXAllInherited.create().get(0) is resolved incorrectly in K1
// FILE: X.java
public interface X {
char get(int index);
}
// FILE: CharBuffer.java
public abstract class CharBuffer implements CharSequence {
public static CharBuffer create() {
return new CharBuffer() {
@Override public char charAt(int index) { return 'c'; }
@Override public char get(int index) { return 'g'; }
@Override public CharSequence subSequence(int start, int end) { return null; }
@Override public int length() { return 0; }
};
}
public abstract char charAt(int index);
public abstract char get(int index);
}
// FILE: CharBufferX.java
public abstract class CharBufferX implements CharSequence, X {
public static CharBufferX create() {
return new CharBufferX() {
@Override public char charAt(int index) { return 'c'; }
@Override public char get(int index) { return 'g'; }
@Override public CharSequence subSequence(int start, int end) { return null; }
@Override public int length() { return 0; }
};
}
public abstract char charAt(int index);
public abstract char get(int index);
}
// FILE: NonCharSequenceBuffer.java
public abstract class NonCharSequenceBuffer implements X {
public static NonCharSequenceBuffer create() {
return new NonCharSequenceBuffer() {
@Override public char charAt(int index) { return 'c'; }
@Override public char get(int index) { return 'g'; }
};
}
public abstract char charAt(int index);
public abstract char get(int index);
}
// FILE: CharBufferCharAtInherited.java
public abstract class CharBufferCharAtInherited implements CharSequence {
public static CharBufferCharAtInherited create() {
return new CharBufferCharAtInherited() {
@Override public char charAt(int index) { return 'c'; }
@Override public char get(int index) { return 'g'; }
@Override public CharSequence subSequence(int start, int end) { return null; }
@Override public int length() { return 0; }
};
}
public abstract char get(int index);
}
// FILE: CharBufferXAllInherited.java
public abstract class CharBufferXAllInherited implements CharSequence, X {
public static CharBufferXAllInherited create() {
return new CharBufferXAllInherited() {
@Override public char charAt(int index) { return 'c'; }
@Override public char get(int index) { return 'g'; }
@Override public CharSequence subSequence(int start, int end) { return null; }
@Override public int length() { return 0; }
};
}
}
// FILE: Y.java
public abstract class Y {
protected abstract char get(int index);
}
// FILE: CharBufferXYAllInherited.java
public abstract class CharBufferXYAllInherited extends Y implements CharSequence, X {
public static CharBufferXYAllInherited create() {
return new CharBufferXYAllInherited() {
@Override public char charAt(int index) { return 'c'; }
@Override public char get(int index) { return 'g'; }
@Override public CharSequence subSequence(int start, int end) { return null; }
@Override public int length() { return 0; }
};
}
}
// FILE: CharAt.java
public interface CharAt {
char charAt(int index);
}
// FILE: CharBufferXYCharAt.java
public abstract class CharBufferXYCharAt extends Y implements CharSequence, X, CharAt {
public static CharBufferXYCharAt create() {
return new CharBufferXYCharAt() {
@Override public char charAt(int index) { return 'c'; }
@Override public char get(int index) { return 'g'; }
@Override public CharSequence subSequence(int start, int end) { return null; }
@Override public int length() { return 0; }
};
}
}
// FILE: box.kt
fun box(): String {
if (CharBuffer.create().get(0) != 'g') return "FAIL 1"
if ((CharBuffer.create() as CharSequence).get(0) != 'c') return "FAIL 2"
if (CharBufferX.create().get(0) != 'g') return "FAIL 3"
if ((CharBufferX.create() as CharSequence).get(0) != 'c') return "FAIL 4"
if ((CharBufferX.create() as X).get(0) != 'g') return "FAIL 5"
if (NonCharSequenceBuffer.create().charAt(0) != 'c') return "FAIL 6"
if (NonCharSequenceBuffer.create().get(0) != 'g') return "FAIL 7"
if ((NonCharSequenceBuffer.create() as X).get(0) != 'g') return "FAIL 8"
if (CharBufferCharAtInherited.create().get(0) != 'g') return "FAIL 9"
if ((CharBufferCharAtInherited.create() as CharSequence).get(0) != 'c') return "FAIL 10"
if (CharBufferXAllInherited.create().get(0) != 'g') return "FAIL 11"
if ((CharBufferXAllInherited.create() as CharSequence).get(0) != 'c') return "FAIL 12"
if ((CharBufferXAllInherited.create() as X).get(0) != 'g') return "FAIL 13"
if (CharBufferXYAllInherited.create().get(0) != 'g') return "FAIL 14"
if ((CharBufferXYAllInherited.create() as CharSequence).get(0) != 'c') return "FAIL 15"
if ((CharBufferXYAllInherited.create() as X).get(0) != 'g') return "FAIL 16"
if ((CharBufferXYAllInherited.create() as Y).get(0) != 'g') return "FAIL 17"
if (CharBufferXYCharAt.create().get(0) != 'g') return "FAIL 18"
if ((CharBufferXYCharAt.create() as CharSequence).get(0) != 'c') return "FAIL 19"
if ((CharBufferXYCharAt.create() as X).get(0) != 'g') return "FAIL 20"
if ((CharBufferXYCharAt.create() as Y).get(0) != 'g') return "FAIL 21"
if ((CharBufferXYCharAt.create() as CharAt).charAt(0) != 'c') return "FAIL 22"
return "OK"
}