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

[FakeOverrideBuilder] Workaround KT-64743

Browse Source 
Because of KT-64743 there is unexpanded type-alias in a place we don't
expect it to occur. To workaround this, we just expand typialiases in
one more place.

^KT-64743
This commit is contained in:
Pavel Kunyavskiy
2024-01-05 14:39:39 +01:00
committed by Space Team
parent c0f0c595c3
commit c6e32571d6
12 changed files with 96 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
+3 -5
View File
@@ -9,10 +9,7 @@ import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.fir.backend.*
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.utils.*
import org.jetbrains.kotlin.fir.resolve.defaultType
import org.jetbrains.kotlin.fir.resolve.isRealOwnerOf
import org.jetbrains.kotlin.fir.resolve.toFirRegularClass
import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.fir.resolve.*
import org.jetbrains.kotlin.fir.scopes.*
import org.jetbrains.kotlin.fir.scopes.impl.FirFakeOverrideGenerator
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
@@ -251,7 +248,8 @@ class FakeOverrideGenerator(
if (!compatibleType) {
return@mapNotNull null
}
symbol to superType.lookupTag
// TODO: it should be already expanded - KT-64743
symbol to superType.fullyExpandedType(session).lookupTag
}
}
}
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -34869,6 +34869,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt");
}
@Test
@TestMetadata("aliasSuperTypeInLazy.kt")
public void testAliasSuperTypeInLazy() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/aliasSuperTypeInLazy.kt");
}
@Test
public void testAllFilesPresentInK2() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -34869,6 +34869,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt");
}
@Test
@TestMetadata("aliasSuperTypeInLazy.kt")
public void testAliasSuperTypeInLazy() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/aliasSuperTypeInLazy.kt");
}
@Test
public void testAllFilesPresentInK2() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -34869,6 +34869,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt");
}
@Test
@TestMetadata("aliasSuperTypeInLazy.kt")
public void testAliasSuperTypeInLazy() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/aliasSuperTypeInLazy.kt");
}
@Test
public void testAllFilesPresentInK2() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);