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

[FIR] Fix deserialization of generic context receivers

Browse Source 
We need to pass the local deserialization context so that generic
type parameters can be referenced.

#KT-62607 Fixed
This commit is contained in:
Kirill Rakhman
2023-10-26 15:10:09 +02:00
committed by Space Team
parent 45a1cc1a4a
commit ef78d4b95a
17 changed files with 87 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+5 -5
View File
@@ -468,7 +468,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
else -> null
}
proto.contextReceiverTypes(c.typeTable).mapTo(contextReceivers, ::loadContextReceiver)
proto.contextReceiverTypes(c.typeTable).mapTo(contextReceivers) { loadContextReceiver(it, local) }
}.apply {
initializer?.replaceConeTypeOrNull(returnTypeRef.type)
this.versionRequirements = versionRequirements
@@ -479,8 +479,8 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
}
}
private fun loadContextReceiver(proto: ProtoBuf.Type): FirContextReceiver {
val typeRef = proto.toTypeRef(c)
private fun loadContextReceiver(proto: ProtoBuf.Type, context: FirDeserializationContext): FirContextReceiver {
val typeRef = proto.toTypeRef(context)
return buildContextReceiver {
val type = typeRef.coneType
this.labelNameFromTypeRef = (type as? ConeLookupTagBasedType)?.lookupTag?.name
@@ -489,7 +489,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
}
internal fun createContextReceiversForClass(classProto: ProtoBuf.Class): List<FirContextReceiver> =
classProto.contextReceiverTypes(c.typeTable).map(::loadContextReceiver)
classProto.contextReceiverTypes(c.typeTable).map { loadContextReceiver(it, c) }
fun loadFunction(
proto: ProtoBuf.Function,
@@ -559,7 +559,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
deprecationsProvider = annotations.getDeprecationsProviderFromAnnotations(c.session, fromJava = false, versionRequirements)
this.containerSource = c.containerSource
proto.contextReceiverTypes(c.typeTable).mapTo(contextReceivers, ::loadContextReceiver)
proto.contextReceiverTypes(c.typeTable).mapTo(contextReceivers) { loadContextReceiver(it, local) }
}.apply {
this.versionRequirements = versionRequirements
setLazyPublishedVisibility(c.session)
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java
Generated
+5
View File
@@ -247,6 +247,11 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java
Generated
+5
View File
@@ -247,6 +247,11 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibCompilerRunnerTestGenerated.java
Generated
+5
View File
@@ -256,6 +256,11 @@ public class IncrementalK1JsKlibCompilerRunnerTestGenerated extends AbstractIncr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
Generated
+5
View File
@@ -256,6 +256,11 @@ public class IncrementalK1JsKlibCompilerWithScopeExpansionRunnerTestGenerated ex
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK1JvmCompilerRunnerTestGenerated.java
Generated
+5
View File
@@ -257,6 +257,11 @@ public class IncrementalK1JvmCompilerRunnerTestGenerated extends AbstractIncreme
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
Generated
+5
View File
@@ -241,6 +241,11 @@ public class IncrementalK2JsKlibCompilerWithScopeExpansionRunnerTestGenerated ex
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalK2JvmCompilerRunnerTestGenerated.java
Generated
+5
View File
@@ -247,6 +247,11 @@ public class IncrementalK2JvmCompilerRunnerTestGenerated extends AbstractIncreme
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK1JvmJpsTestGenerated.java
Generated
+5
View File
@@ -926,6 +926,11 @@ public class IncrementalK1JvmJpsTestGenerated extends AbstractIncrementalK1JvmJp
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2FirICLightTreeJvmJpsTestGenerated.java
Generated
+5
View File
@@ -252,6 +252,11 @@ public class IncrementalK2FirICLightTreeJvmJpsTestGenerated extends AbstractIncr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2JvmJpsTestGenerated.java
Generated
+5
View File
@@ -252,6 +252,11 @@ public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJp
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalK2LightTreeJvmJpsTestGenerated.java
Generated
+5
View File
@@ -252,6 +252,11 @@ public class IncrementalK2LightTreeJvmJpsTestGenerated extends AbstractIncrement
runTest("jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/");
}
@TestMetadata("genericContextReceiver")
public void testGenericContextReceiver() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/");
}
@TestMetadata("independentClasses")
public void testIndependentClasses() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/");
jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/args.txt
Vendored
+1
View File
@@ -0,0 +1 @@
-XXLanguage:+ContextReceivers
jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/bar.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
package test
fun test() {
with("") {
foo()
foo
}
}
jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/bar.kt.touch
Vendored
View File
jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/build.log
Vendored
+11
View File
@@ -0,0 +1,11 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/BarKt.class
End of files
Compiling files:
src/bar.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/genericContextReceiver/foo.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
context(T)
fun <T> foo() {}
context(T)
val <T> T.foo get() = 1