[FE] Create separate class for context receiver value

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

@@ -965,8 +965,8 @@ public class DescriptorResolver {
             receiverType = typeResolver.resolveType(scopeForDeclarationResolutionWithTypeParameters, receiverTypeRef, trace, true);
             AnnotationSplitter splitter = new AnnotationSplitter(storageManager, receiverType.getAnnotations(), EnumSet.of(RECEIVER));
             receiverDescriptor = DescriptorFactory.createExtensionReceiverParameterForCallable(
-                    propertyDescriptor, receiverType, splitter.getAnnotationsForTarget(RECEIVER),
-                    false);
+                    propertyDescriptor, receiverType, splitter.getAnnotationsForTarget(RECEIVER)
+            );
             receiverToLabelMap.put(receiverDescriptor, receiverTypeRef.nameForReceiverLabel());
         }
 
@@ -1046,9 +1046,9 @@ public class DescriptorResolver {
         return Lists.reverse(contextReceivers).stream().map(contextReceiver -> {
             KotlinType receiverType = contextReceiversToTypes.get(contextReceiver);
             AnnotationSplitter splitter = new AnnotationSplitter(storageManager, receiverType.getAnnotations(), EnumSet.of(RECEIVER));
-            ReceiverParameterDescriptor receiverDescriptor = DescriptorFactory.createExtensionReceiverParameterForCallable(
-                    propertyDescriptor, receiverType, splitter.getAnnotationsForTarget(RECEIVER),
-                    true);
+            ReceiverParameterDescriptor receiverDescriptor = DescriptorFactory.createContextReceiverParameterForCallable(
+                    propertyDescriptor, receiverType, splitter.getAnnotationsForTarget(RECEIVER)
+            );
             String contextReceiverName = contextReceiver.name();
             if (contextReceiverName != null) {
                 receiverToLabelMap.put(receiverDescriptor, contextReceiverName);

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

@@ -232,7 +232,7 @@ class FunctionDescriptorResolver(
         val extensionReceiver = receiverType?.let {
             val splitter = AnnotationSplitter(storageManager, receiverType.annotations, EnumSet.of(AnnotationUseSiteTarget.RECEIVER))
             DescriptorFactory.createExtensionReceiverParameterForCallable(
-                functionDescriptor, it, splitter.getAnnotationsForTarget(AnnotationUseSiteTarget.RECEIVER), false
+                functionDescriptor, it, splitter.getAnnotationsForTarget(AnnotationUseSiteTarget.RECEIVER)
             )
         }?.apply {
             val extensionReceiverName = receiverTypeRef?.nameForReceiverLabel()
@@ -243,15 +243,16 @@ class FunctionDescriptorResolver(
 
         val contextReceiverDescriptors = contextReceiverTypes.mapNotNull { type ->
             val splitter = AnnotationSplitter(storageManager, type.annotations, EnumSet.of(AnnotationUseSiteTarget.RECEIVER))
-            DescriptorFactory.createExtensionReceiverParameterForCallable(
-                functionDescriptor, type, splitter.getAnnotationsForTarget(AnnotationUseSiteTarget.RECEIVER), true
+            DescriptorFactory.createContextReceiverParameterForCallable(
+                functionDescriptor, type, splitter.getAnnotationsForTarget(AnnotationUseSiteTarget.RECEIVER)
             )
         }
-        contextReceiverDescriptors.reversed().zip(contextReceivers.lastIndex downTo 0).forEach { (contextReceiverDescriptor, i) ->
-            contextReceivers[i].name()?.let {
-                receiverToLabelMap[contextReceiverDescriptor] = it
+        contextReceiverDescriptors.zip(0 until contextReceivers.size).reversed()
+            .forEach { (contextReceiverDescriptor, i) ->
+                contextReceivers[i].name()?.let {
+                    receiverToLabelMap[contextReceiverDescriptor] = it
+                }
             }
-        }
         trace.record(BindingContext.DESCRIPTOR_TO_NAMED_RECEIVERS, functionDescriptor, receiverToLabelMap)
         functionDescriptor.initialize(
             extensionReceiver,

compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java

@@ -66,6 +66,7 @@ import org.jetbrains.kotlin.resolve.checkers.UnderscoreChecker;
 import org.jetbrains.kotlin.resolve.constants.*;
 import org.jetbrains.kotlin.resolve.scopes.LexicalScopeKind;
 import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope;
+import org.jetbrains.kotlin.resolve.scopes.receivers.ContextReceiver;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
@@ -599,7 +600,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
             else if (!receivers.isEmpty()) {
                 // `this` cannot point to context receiver
                 for (ReceiverParameterDescriptor receiver : receivers) {
-                    if (!(receiver.getValue() instanceof ExtensionReceiver) || !((ExtensionReceiver) receiver.getValue()).isContextReceiver()) {
+                    if (!(receiver.getValue() instanceof ContextReceiver)) {
                         result = receiver;
                         break;
                     }

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt

@@ -95,11 +95,11 @@ fun StatementGenerator.generateReceiver(ktDefaultElement: KtElement, receiver: R
 fun StatementGenerator.generateReceiver(defaultStartOffset: Int, defaultEndOffset: Int, receiver: ReceiverValue): IntermediateValue {
     val irReceiverType =
         when (receiver) {
-            is ExtensionReceiver -> {
-                val receiverParameters =
-                    receiver.declarationDescriptor.contextReceiverParameters + listOfNotNull(receiver.declarationDescriptor.extensionReceiverParameter)
-                val receiverParameter = receiverParameters.firstOrNull { it.value == receiver }
-                    ?: receiver.declarationDescriptor.extensionReceiverParameter!!
+            is ExtensionReceiver ->
+                receiver.declarationDescriptor.extensionReceiverParameter!!.type.toIrType()
+            is ContextReceiver -> {
+                val receiverParameter = receiver.declarationDescriptor.contextReceiverParameters.firstOrNull()
+                    ?: error("Unknown receiver: $receiver")
                 receiverParameter.type.toIrType()
             }
             else ->
@@ -142,10 +142,14 @@ fun StatementGenerator.generateReceiver(defaultStartOffset: Int, defaultEndOffse
                 is ExpressionReceiver ->
                     generateExpression(receiver.expression)
                 is ExtensionReceiver -> {
-                    val receiverParameters = listOfNotNull(receiver.declarationDescriptor.extensionReceiverParameter) +
-                            receiver.declarationDescriptor.contextReceiverParameters
-                    val receiverParameter = receiverParameters.singleOrNull { it.value == receiver }
-                        ?: receiver.declarationDescriptor.extensionReceiverParameter!!
+                    IrGetValueImpl(
+                        defaultStartOffset, defaultStartOffset, irReceiverType,
+                        context.symbolTable.referenceValueParameter(receiver.declarationDescriptor.extensionReceiverParameter!!)
+                    )
+                }
+                is ContextReceiver -> {
+                    val receiverParameter = receiver.declarationDescriptor.contextReceiverParameters
+                        .single { it.value == receiver }
                     IrGetValueImpl(
                         defaultStartOffset, defaultStartOffset, irReceiverType,
                         context.symbolTable.referenceValueParameter(receiverParameter)