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

IR: Test for toSkip(this) in T.resolveFakeOverride()

Browse Source 
^KT-49371 Fixed
This commit is contained in:
Georgy Bronnikov
2021-10-27 00:21:31 +03:00
parent c67a1ee2e5
commit 534beb8553
10 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16078,6 +16078,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
}
@Test
@TestMetadata("kt49371.kt")
public void testKt49371() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
}
@Test
@TestMetadata("privateFakeOverrides0.kt")
public void testPrivateFakeOverrides0() throws Exception {
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrFakeOverrideUtils.kt
+1 -1
View File
@@ -98,7 +98,7 @@ fun <S : IrSymbol, T : IrOverridableDeclaration<S>> T.resolveFakeOverride(
allowAbstract: Boolean = false,
toSkip: (T) -> Boolean = { false }
): T? {
if (!isFakeOverride) return this
if (!isFakeOverride && !toSkip(this)) return this
return if (allowAbstract) {
val reals = collectRealOverrides(toSkip)
if (reals.isEmpty()) error("No real overrides for ${this.render()}")
compiler/testData/codegen/box/fakeOverride/kt49371.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
interface Left
interface Right
class Bottom : Left, Right
interface A<T> {
fun f(): T? {
return null
}
}
interface B<T : Left> : A<T> {}
abstract class C<T> : A<T>
abstract class D<T : Right> : C<T>()
class Z : D<Bottom>(), B<Bottom>
fun box(): String {
Z().f()
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16000,6 +16000,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
}
@Test
@TestMetadata("kt49371.kt")
public void testKt49371() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
}
@Test
@TestMetadata("privateFakeOverrides0.kt")
public void testPrivateFakeOverrides0() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16078,6 +16078,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
}
@Test
@TestMetadata("kt49371.kt")
public void testKt49371() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
}
@Test
@TestMetadata("privateFakeOverrides0.kt")
public void testPrivateFakeOverrides0() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -13173,6 +13173,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
}
@TestMetadata("kt49371.kt")
public void testKt49371() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
}
@TestMetadata("privateFakeOverrides0.kt")
public void testPrivateFakeOverrides0() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/privateFakeOverrides0.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -11672,6 +11672,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
}
@TestMetadata("kt49371.kt")
public void testKt49371() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
}
@TestMetadata("privateFakeOverrides0.kt")
public void testPrivateFakeOverrides0() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/privateFakeOverrides0.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -11078,6 +11078,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
}
@TestMetadata("kt49371.kt")
public void testKt49371() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
}
@TestMetadata("privateFakeOverrides0.kt")
public void testPrivateFakeOverrides0() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/privateFakeOverrides0.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -10339,6 +10339,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
}
@TestMetadata("kt49371.kt")
public void testKt49371() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
}
@TestMetadata("privateFakeOverrides0.kt")
public void testPrivateFakeOverrides0() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/privateFakeOverrides0.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -12468,6 +12468,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
}
@Test
@TestMetadata("kt49371.kt")
public void testKt49371() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
}
@Test
@TestMetadata("privateFakeOverrides0.kt")
public void testPrivateFakeOverrides0() throws Exception {