[k1] add information about context receiver labels to ContextClassReceiver/ContextReceiver

compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java

@@ -984,7 +984,7 @@ public class DescriptorResolver {
                     KotlinType type = typeResolver.resolveType(scopeForDeclarationResolutionWithTypeParameters, typeReference, trace, true);
                     AnnotationSplitter splitter = new AnnotationSplitter(storageManager, type.getAnnotations(), EnumSet.of(RECEIVER));
                     return DescriptorFactory.createContextReceiverParameterForCallable(
-                            propertyDescriptor, type, splitter.getAnnotationsForTarget(RECEIVER)
+                            propertyDescriptor, type, contextReceiver.labelNameAsName(), splitter.getAnnotationsForTarget(RECEIVER)
                     );
                 }).collect(Collectors.toList());
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt

@@ -58,7 +58,8 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope
 import org.jetbrains.kotlin.resolve.scopes.TraceBasedLocalRedeclarationChecker
 import org.jetbrains.kotlin.resolve.source.toSourceElement
 import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 import org.jetbrains.kotlin.types.error.ErrorTypeKind
 import org.jetbrains.kotlin.types.error.ErrorUtils
@@ -66,6 +67,7 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.isFunctionExpression
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.isFunctionLiteral
+import org.jetbrains.kotlin.types.isError
 import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
 import java.util.*
 
@@ -201,8 +203,12 @@ class FunctionDescriptorResolver(
         val contextReceiverTypes =
             if (function is KtFunctionLiteral) expectedFunctionType.getContextReceiversTypes()
             else contextReceivers
-                .mapNotNull { it.typeReference() }
+                .mapNotNull {
-                .map { typeResolver.resolveType(headerScope, it, trace, true) }
+                    val typeReference = it.typeReference() ?: return@mapNotNull null
+                    val type = typeResolver.resolveType(headerScope, typeReference, trace, true)
+                    ContextReceiverTypeWithLabel(type, it.labelNameAsName())
+                }
+
 
         val valueParameterDescriptors =
             createValueParameterDescriptors(function, functionDescriptor, headerScope, trace, expectedFunctionType, inferenceSession)
@@ -234,10 +240,13 @@ class FunctionDescriptorResolver(
                 functionDescriptor, it, splitter.getAnnotationsForTarget(AnnotationUseSiteTarget.RECEIVER)
             )
         }
-        val contextReceiverDescriptors = contextReceiverTypes.mapNotNull {
+        val contextReceiverDescriptors = contextReceiverTypes.mapNotNull { contextReceiver ->
-            val splitter = AnnotationSplitter(storageManager, it.annotations, EnumSet.of(AnnotationUseSiteTarget.RECEIVER))
+            val splitter = AnnotationSplitter(storageManager, contextReceiver.type.annotations, EnumSet.of(AnnotationUseSiteTarget.RECEIVER))
             DescriptorFactory.createContextReceiverParameterForCallable(
-                functionDescriptor, it, splitter.getAnnotationsForTarget(AnnotationUseSiteTarget.RECEIVER)
+                functionDescriptor,
+                contextReceiver.type,
+                contextReceiver.label,
+                splitter.getAnnotationsForTarget(AnnotationUseSiteTarget.RECEIVER),
             )
         }
 
@@ -358,8 +367,12 @@ class FunctionDescriptorResolver(
     private fun KotlinType.getReceiverType(): KotlinType? =
         if (functionTypeExpected()) this.getReceiverTypeFromFunctionType() else null
 
-    private fun KotlinType.getContextReceiversTypes(): List<KotlinType> =
+    private fun KotlinType.getContextReceiversTypes(): List<ContextReceiverTypeWithLabel> =
-        if (functionTypeExpected()) this.getContextReceiverTypesFromFunctionType() else emptyList()
+        if (functionTypeExpected()) {
+            this.getContextReceiverTypesFromFunctionType().map { ContextReceiverTypeWithLabel(it, label = null)}
+        } else {
+            emptyList()
+        }
 
     private fun KotlinType.getValueParameters(owner: FunctionDescriptor): List<ValueParameterDescriptor>? =
         if (functionTypeExpected()) {
@@ -514,4 +527,6 @@ class FunctionDescriptorResolver(
         }
         return result
     }
+
+    private data class ContextReceiverTypeWithLabel(val type: KotlinType, val label: Name?)
 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java

@@ -308,17 +308,20 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
             }
             List<KtContextReceiver> contextReceivers = classOrObject.getContextReceivers();
             List<ReceiverParameterDescriptor> contextReceiverDescriptors = contextReceivers.stream()
-                    .map(KtContextReceiver::typeReference)
+                    .map(contextReceiver -> {
-                    .filter(Objects::nonNull)
+                        KtTypeReference typeReference = contextReceiver.typeReference();
-                    .map(typeReference -> {
+                        if (typeReference == null) return null;
                         KotlinType kotlinType =
                                 c.getTypeResolver().resolveType(getScopeForClassHeaderResolution(), typeReference, c.getTrace(), true);
                         return DescriptorFactory.createContextReceiverParameterForClass(
                                 this,
                                 kotlinType,
+                                contextReceiver.labelNameAsName(),
                                 Annotations.Companion.getEMPTY()
                         );
-                    }).collect(Collectors.toList());
+                    })
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
 
             if (c.getLanguageVersionSettings().supportsFeature(LanguageFeature.ContextReceivers)) {
                 HashMultimap<String, ReceiverParameterDescriptor> labelNameToReceiverMap = HashMultimap.create();

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java

@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationsKt;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.resolve.DescriptorFactory;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver;
+import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitContextReceiver;
 import org.jetbrains.kotlin.types.*;
 import org.jetbrains.kotlin.utils.SmartList;
 
@@ -635,6 +636,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
                 }
                 ReceiverParameterDescriptor substitutedContextReceiverParameter =
                         DescriptorFactory.createContextReceiverParameterForCallable(substitutedDescriptor, substitutedContextReceiverType,
+                                                                                    ((ImplicitContextReceiver)newContextReceiverParameter.getValue()).getCustomLabelName(),
                                                                                     newContextReceiverParameter.getAnnotations());
                 substitutedContextReceiverParameters.add(substitutedContextReceiverParameter);
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ContextReceiver;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver;
+import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitContextReceiver;
 import org.jetbrains.kotlin.types.*;
 import org.jetbrains.kotlin.utils.SmartSet;
 
@@ -561,7 +562,10 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
         if (substitutedType == null) return null;
         return new ReceiverParameterDescriptorImpl(
                 substitutedPropertyDescriptor,
-                new ContextReceiver(substitutedPropertyDescriptor, substitutedType, receiverParameterDescriptor.getValue()),
+                new ContextReceiver(substitutedPropertyDescriptor,
+                                    substitutedType,
+                                    ((ImplicitContextReceiver) receiverParameterDescriptor.getValue()).getCustomLabelName(),
+                                    receiverParameterDescriptor.getValue()),
                 receiverParameterDescriptor.getAnnotations()
         );
     }

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeAliasConstructorDescriptor.kt

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.resolve.DescriptorFactory
+import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitContextReceiver
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.storage.getValue
 import org.jetbrains.kotlin.types.*
@@ -209,6 +210,7 @@ class TypeAliasConstructorDescriptorImpl private constructor(
                     DescriptorFactory.createContextReceiverParameterForClass(
                         classDescriptor,
                         substitutorForUnderlyingClass.safeSubstitute(it.type, Variance.INVARIANT),
+                        (it.value as ImplicitContextReceiver).customLabelName,
                         Annotations.EMPTY
                     )
                 }

core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java

@@ -200,21 +200,23 @@ public class DescriptorFactory {
     public static ReceiverParameterDescriptor createContextReceiverParameterForCallable(
             @NotNull CallableDescriptor owner,
             @Nullable KotlinType receiverParameterType,
+            @Nullable Name customLabelName,
             @NotNull Annotations annotations
     ) {
         return receiverParameterType == null
                ? null
-               : new ReceiverParameterDescriptorImpl(owner, new ContextReceiver(owner, receiverParameterType, null), annotations);
+               : new ReceiverParameterDescriptorImpl(owner, new ContextReceiver(owner, receiverParameterType, customLabelName, null), annotations);
     }
 
     @Nullable
     public static ReceiverParameterDescriptor createContextReceiverParameterForClass(
             @NotNull ClassDescriptor owner,
             @Nullable KotlinType receiverParameterType,
+            @Nullable Name customLabelName,
             @NotNull Annotations annotations
     ) {
         return receiverParameterType == null
                ? null
-               : new ReceiverParameterDescriptorImpl(owner, new ContextClassReceiver(owner, receiverParameterType, null), annotations);
+               : new ReceiverParameterDescriptorImpl(owner, new ContextClassReceiver(owner, receiverParameterType, customLabelName, null), annotations);
     }
 }

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ContextClassReceiver.kt

@@ -7,17 +7,19 @@ package org.jetbrains.kotlin.resolve.scopes.receivers
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.KotlinType
 
 class ContextClassReceiver(
     val classDescriptor: ClassDescriptor,
     receiverType: KotlinType,
+    override val customLabelName: Name?,
     original: ReceiverValue?
-): AbstractReceiverValue(receiverType, original), ImplicitReceiver {
+): AbstractReceiverValue(receiverType, original), ImplicitContextReceiver {
     override val declarationDescriptor: DeclarationDescriptor
         get() = classDescriptor
 
-    override fun replaceType(newType: KotlinType): ReceiverValue = ContextClassReceiver(classDescriptor, newType, original)
+    override fun replaceType(newType: KotlinType): ReceiverValue = ContextClassReceiver(classDescriptor, newType, customLabelName, original)
 
     override fun toString(): String = "$type: Ctx { $classDescriptor }"
 }

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ContextReceiver.kt

@@ -6,14 +6,16 @@
 package org.jetbrains.kotlin.resolve.scopes.receivers
 
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.KotlinType
 
 class ContextReceiver(
     override val declarationDescriptor: CallableDescriptor,
     receiverType: KotlinType,
+    override val customLabelName: Name?,
     original: ReceiverValue?
-) : AbstractReceiverValue(receiverType, original), ImplicitReceiver {
+) : AbstractReceiverValue(receiverType, original), ImplicitContextReceiver {
-    override fun replaceType(newType: KotlinType): ReceiverValue = ContextReceiver(declarationDescriptor, newType, original)
+    override fun replaceType(newType: KotlinType): ReceiverValue = ContextReceiver(declarationDescriptor, newType, customLabelName, original)
 
     override fun toString(): String = "Cxt { $declarationDescriptor }"
 }

core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ImplicitReceiver.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.resolve.scopes.receivers
 
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.name.Name
 
 /**
  * Describes an implicit "this" receiver
@@ -24,3 +25,8 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 interface ImplicitReceiver : ReceiverValue {
     val declarationDescriptor: DeclarationDescriptor
 }
+
+
+interface ImplicitContextReceiver : ImplicitReceiver {
+    val customLabelName: Name?
+}

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt

@@ -358,6 +358,11 @@ class MemberDeserializer(private val c: DeserializationContext) {
         callableDescriptor: CallableDescriptor
     ): ReceiverParameterDescriptor? {
         val contextReceiverType = deserializationContext.typeDeserializer.type(this)
-        return DescriptorFactory.createContextReceiverParameterForCallable(callableDescriptor, contextReceiverType, Annotations.EMPTY)
+        return DescriptorFactory.createContextReceiverParameterForCallable(
+            callableDescriptor,
+            contextReceiverType,
+            /* customLabelName = */ null/*todo store custom label name in metadata?*/,
+            Annotations.EMPTY
+        )
     }
 }

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt

@@ -150,7 +150,12 @@ class DeserializedClassDescriptor(
         val contextReceiverType = c.typeDeserializer.type(it)
         ReceiverParameterDescriptorImpl(
             thisAsReceiverParameter,
-            ContextClassReceiver(this, contextReceiverType, null),
+            ContextClassReceiver(
+                this,
+                contextReceiverType,
+                /* customLabelName = */ null/*todo store custom label name in metadata?*/,
+                null
+            ),
             Annotations.EMPTY
         );
     }