[FE, PSI2IR] Pass context receivers when calling typealias constructor

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java

@@ -15976,6 +15976,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/extensionClasses/simple.kt");
         }
 
+        @Test
+        @TestMetadata("typealiasForContextualClass.kt")
+        public void testTypealiasForContextualClass() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionClasses/typealiasForContextualClass.kt");
+        }
+
         @Test
         @TestMetadata("useFromAnotherModule.kt")
         public void testUseFromAnotherModule() throws Exception {

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

@@ -311,9 +311,9 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
                     .map(typeReference -> {
                         KotlinType kotlinType =
                                 c.getTypeResolver().resolveType(getScopeForClassHeaderResolution(), typeReference, c.getTrace(), true);
-                        return new ReceiverParameterDescriptorImpl(
+                        return DescriptorFactory.createContextReceiverParameterForClass(
                                 this,
-                                new ContextClassReceiver(this, kotlinType, null),
+                                kotlinType,
                                 Annotations.Companion.getEMPTY()
                         );
             }).collect(Collectors.toList());

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

@@ -252,7 +252,7 @@ fun StatementGenerator.generateCallReceiver(
             }
             dispatchReceiverValue = generateReceiverOrNull(ktDefaultElement, extensionReceiver ?: dispatchReceiver)
             extensionReceiverValue = null
-            contextReceiverValues = emptyList()
+            contextReceiverValues = contextReceivers.mapNotNull { generateReceiverOrNull(ktDefaultElement, it) }
         }
         else -> {
             dispatchReceiverValue = generateReceiverOrNull(ktDefaultElement, dispatchReceiver)

compiler/testData/codegen/box/extensionClasses/typealiasForContextualClass.kt

@@ -0,0 +1,17 @@
+// !LANGUAGE: +ContextReceivers
+// TARGET_BACKEND: JVM_IR
+// IGNORE_BACKEND_FIR: JVM_IR
+
+class A {
+    val ok = "OK"
+}
+
+context(A)
+class B {
+    val result = ok
+}
+
+typealias C = B
+
+fun box(): String =
+    with(A()) { C().result }

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java

@@ -15976,6 +15976,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/extensionClasses/simple.kt");
         }
 
+        @Test
+        @TestMetadata("typealiasForContextualClass.kt")
+        public void testTypealiasForContextualClass() throws Exception {
+            runTest("compiler/testData/codegen/box/extensionClasses/typealiasForContextualClass.kt");
+        }
+
         @Test
         @TestMetadata("useFromAnotherModule.kt")
         public void testUseFromAnotherModule() throws Exception {

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

@@ -83,7 +83,7 @@ class TypeAliasConstructorDescriptorImpl private constructor(
             typeAliasConstructor.initialize(
                 null,
                 underlyingConstructorDescriptor.dispatchReceiverParameter?.substitute(substitutorForUnderlyingClass),
-                emptyList(),
+                underlyingConstructorDescriptor.contextReceiverParameters.map { it.substitute(substitutorForUnderlyingClass) },
                 typeAliasDescriptor.declaredTypeParameters,
                 valueParameters,
                 returnType,
@@ -203,10 +203,21 @@ class TypeAliasConstructorDescriptorImpl private constructor(
                 )
             }
 
+            val classDescriptor = typeAliasDescriptor.classDescriptor
+            val contextReceiverParameters = classDescriptor?.let {
+                constructor.contextReceiverParameters.map {
+                    DescriptorFactory.createContextReceiverParameterForClass(
+                        classDescriptor,
+                        substitutorForUnderlyingClass.safeSubstitute(it.type, Variance.INVARIANT),
+                        Annotations.EMPTY
+                    )
+                }
+            } ?: emptyList()
+
             typeAliasConstructor.initialize(
                 receiverParameter,
                 null,
-                emptyList(),
+                contextReceiverParameters,
                 typeAliasDescriptor.declaredTypeParameters,
                 valueParameters,
                 returnType,

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

@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.annotations.Annotations;
 import org.jetbrains.kotlin.descriptors.impl.*;
 import org.jetbrains.kotlin.name.Name;
+import org.jetbrains.kotlin.resolve.scopes.receivers.ContextClassReceiver;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ContextReceiver;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver;
 import org.jetbrains.kotlin.types.KotlinType;
@@ -205,4 +206,15 @@ public class DescriptorFactory {
                ? null
                : new ReceiverParameterDescriptorImpl(owner, new ContextReceiver(owner, receiverParameterType, null), annotations);
     }
+
+    @Nullable
+    public static ReceiverParameterDescriptor createContextReceiverParameterForClass(
+            @NotNull ClassDescriptor owner,
+            @Nullable KotlinType receiverParameterType,
+            @NotNull Annotations annotations
+    ) {
+        return receiverParameterType == null
+               ? null
+               : new ReceiverParameterDescriptorImpl(owner, new ContextClassReceiver(owner, receiverParameterType, null), annotations);
+    }
 }

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeExtBlackBoxTestGenerated.java

@@ -16161,6 +16161,12 @@ public class NativeExtBlackBoxTestGenerated extends AbstractNativeBlackBoxTest {
                 runTest("compiler/testData/codegen/box/extensionClasses/simple.kt");
             }
 
+            @Test
+            @TestMetadata("typealiasForContextualClass.kt")
+            public void testTypealiasForContextualClass() throws Exception {
+                runTest("compiler/testData/codegen/box/extensionClasses/typealiasForContextualClass.kt");
+            }
+
             @Test
             @TestMetadata("useFromAnotherModule.kt")
             public void testUseFromAnotherModule() throws Exception {