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

K2: Fix deserialization of upper bound of type parameter in nested class

Browse Source 
Previously, containingDeclarationSymbol for V was set to the outer class
BaseRoot, so its upper bounds was computed to the ones from TNested
at org.jetbrains.kotlin.fir.resolve.calls.CreateFreshTypeVariableSubstitutorStageKt.getTypeParameterFromExpandedClass

^KT-56706 Fixed
This commit is contained in:
Denis.Zharkov
2023-02-17 18:24:23 +01:00
committed by Space Team
parent 9f51d3fbeb
commit 0c9fad87c3
15 changed files with 100 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+2 -1
View File
@@ -85,11 +85,12 @@ fun deserializeClassToSymbol(
val context =
parentContext?.childContext(
classProto.typeParameterList,
containingDeclarationSymbol = symbol,
nameResolver,
TypeTable(classProto.typeTable),
classId.relativeClassName,
containerSource,
symbol,
outerClassSymbol = symbol,
annotationDeserializer,
if (status.isCompanion) {
parentContext.constDeserializer
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+1 -1
View File
@@ -60,6 +60,7 @@ class FirDeserializationContext(
fun childContext(
typeParameterProtos: List<ProtoBuf.TypeParameter>,
containingDeclarationSymbol: FirBasedSymbol<*>,
nameResolver: NameResolver = this.nameResolver,
typeTable: TypeTable = this.typeTable,
relativeClassName: FqName? = this.relativeClassName,
@@ -68,7 +69,6 @@ class FirDeserializationContext(
annotationDeserializer: AbstractAnnotationDeserializer = this.annotationDeserializer,
constDeserializer: FirConstDeserializer = this.constDeserializer,
capturesTypeParameters: Boolean = true,
containingDeclarationSymbol: FirBasedSymbol<*>? = this.outerClassSymbol
): FirDeserializationContext = FirDeserializationContext(
nameResolver,
typeTable,
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -18511,6 +18511,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/fir/namedArgumentOnTypeAnnotation.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
@Test
@TestMetadata("noSymbolForIntRangeIterator.kt")
public void testNoSymbolForIntRangeIterator() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -18511,6 +18511,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/fir/namedArgumentOnTypeAnnotation.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
@Test
@TestMetadata("noSymbolForIntRangeIterator.kt")
public void testNoSymbolForIntRangeIterator() throws Exception {
compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt
Vendored
+27
View File
@@ -0,0 +1,27 @@
// ISSUE: KT-56706
// MODULE: lib
// FILE: lib.kt
package lib
abstract class BaseRoot<TNested : BaseRoot.BaseNested<*>> {
open class BaseNested<V>(val box: V)
}
// MODULE: main(lib)
// FILE: main.kt
package main
import lib.BaseRoot
class Foo(val v: String)
class ImplRoot : BaseRoot<ImplRoot.ImplNested>() {
class ImplNested: BaseNested<Foo>(box = Foo("OK")) {
fun bar(): String {
return BaseNested(box).box.v // K1 doesn't report it, yet message is really strange
// "actual type is main/Foo but lib/BaseRoot.BaseNested<*> was expected" which is also strange, since type of box is main/Foo and V for argument
}
}
}
fun box(): String = ImplRoot.ImplNested().bar()
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -17581,6 +17581,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/fir/NameHighlighter.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
@Test
@TestMetadata("notFoundClasses.kt")
public void testNotFoundClasses() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -18511,6 +18511,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/fir/namedArgumentOnTypeAnnotation.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
@Test
@TestMetadata("noSymbolForIntRangeIterator.kt")
public void testNoSymbolForIntRangeIterator() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -14568,6 +14568,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/fir/NameHighlighter.kt");
}
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
@TestMetadata("notFoundClasses.kt")
public void testNotFoundClasses() throws Exception {
runTest("compiler/testData/codegen/box/fir/notFoundClasses.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -13544,6 +13544,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
public void testFalsePositiveBoundSmartcast() throws Exception {
runTest("compiler/testData/codegen/box/fir/falsePositiveBoundSmartcast.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
}
@Nested
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -13640,6 +13640,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
public void testFalsePositiveBoundSmartcast() throws Exception {
runTest("compiler/testData/codegen/box/fir/falsePositiveBoundSmartcast.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
}
@Nested
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -13640,6 +13640,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
public void testFalsePositiveBoundSmartcast() throws Exception {
runTest("compiler/testData/codegen/box/fir/falsePositiveBoundSmartcast.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
}
@Nested
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -13640,6 +13640,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
public void testFalsePositiveBoundSmartcast() throws Exception {
runTest("compiler/testData/codegen/box/fir/falsePositiveBoundSmartcast.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
}
@Nested
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K2NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14858,6 +14858,12 @@ public class K2NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes
public void testFalsePositiveBoundSmartcast() throws Exception {
runTest("compiler/testData/codegen/box/fir/falsePositiveBoundSmartcast.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
}
@Nested
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -14682,6 +14682,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
public void testFalsePositiveBoundSmartcast() throws Exception {
runTest("compiler/testData/codegen/box/fir/falsePositiveBoundSmartcast.kt");
}
@Test
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
}
@Nested
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -12107,6 +12107,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
public void testFalsePositiveBoundSmartcast() throws Exception {
runTest("compiler/testData/codegen/box/fir/falsePositiveBoundSmartcast.kt");
}
@TestMetadata("nestedClassTypeParameterDeserialization.kt")
public void testNestedClassTypeParameterDeserialization() throws Exception {
runTest("compiler/testData/codegen/box/fir/nestedClassTypeParameterDeserialization.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/fullJdk")