[FE] Consider derived class tag on caching substitution scopes

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java

@@ -31232,6 +31232,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
             }
 
+            @Test
+            @TestMetadata("delegatedConstructor.kt")
+            public void testDelegatedConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/subtyping/delegatedConstructor.kt");
+            }
+
             @Test
             @TestMetadata("extFunctionTypeAsSuperType.kt")
             public void testExtFunctionTypeAsSuperType() throws Exception {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java

@@ -31328,6 +31328,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
             }
 
+            @Test
+            @TestMetadata("delegatedConstructor.kt")
+            public void testDelegatedConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/subtyping/delegatedConstructor.kt");
+            }
+
             @Test
             @TestMetadata("extFunctionTypeAsSuperType.kt")
             public void testExtFunctionTypeAsSuperType() throws Exception {

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java

@@ -31232,6 +31232,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
             }
 
+            @Test
+            @TestMetadata("delegatedConstructor.kt")
+            public void testDelegatedConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/subtyping/delegatedConstructor.kt");
+            }
+
             @Test
             @TestMetadata("extFunctionTypeAsSuperType.kt")
             public void testExtFunctionTypeAsSuperType() throws Exception {

compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/FirKotlinScopeProvider.kt

@@ -83,7 +83,10 @@ class FirKotlinScopeProvider(
 
 
 data class ConeSubstitutionScopeKey(
-    val lookupTag: ConeClassLikeLookupTag, val isFromExpectClass: Boolean, val substitutor: ConeSubstitutor
+    val lookupTag: ConeClassLikeLookupTag,
+    val isFromExpectClass: Boolean,
+    val substitutor: ConeSubstitutor,
+    val derivedClassLookupTag: ConeClassLikeLookupTag?
 ) : ScopeSessionKey<FirClass, FirClassSubstitutionScope>()
 
 fun FirClass.unsubstitutedScope(
@@ -162,10 +165,14 @@ private fun FirClass.scopeForClassImpl(
     val basicScope = unsubstitutedScope(useSiteSession, scopeSession, withForcedTypeCalculator = false)
     if (substitutor == ConeSubstitutor.Empty) return basicScope
 
-    val key = ConeSubstitutionScopeKey(classFirDispatchReceiver.symbol.toLookupTag(), isFromExpectClass, substitutor)
+    val key = ConeSubstitutionScopeKey(
-    return scopeSession.getOrBuild(
+        classFirDispatchReceiver.symbol.toLookupTag(),
-        this, key
+        isFromExpectClass,
-    ) {
+        substitutor,
+        derivedClassLookupTag
+    )
+
+    return scopeSession.getOrBuild(this, key) {
         FirClassSubstitutionScope(
             useSiteSession,
             basicScope,

compiler/testData/diagnostics/tests/subtyping/delegatedConstructor.kt

@@ -0,0 +1,29 @@
+// FIR_IDENTICAL
+
+// MODULE: lib
+
+// FILE: lib.kt
+package lib
+
+abstract class Base<in T>
+
+
+// MODULE: test(lib)
+
+// FILE: foo.kt
+package test
+
+import lib.Base
+
+class Foo {
+    private inner class FooImpl : Base<Any?>()
+}
+
+// FILE: bar.kt
+package test
+
+import lib.Base
+
+class Bar {
+    private inner class BarImpl : Base<Any?>()
+}

compiler/testData/diagnostics/tests/subtyping/delegatedConstructor.txt

@@ -0,0 +1,46 @@
+// -- Module: <lib> --
+package
+
+package lib {
+
+    public abstract class Base</*0*/ in T> {
+        public constructor Base</*0*/ in T>()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+// -- Module: <test> --
+package
+
+package test {
+
+    public final class Bar {
+        public constructor Bar()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        private final inner class BarImpl : lib.Base<kotlin.Any?> {
+            public constructor BarImpl()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public final class Foo {
+        public constructor Foo()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        private final inner class FooImpl : lib.Base<kotlin.Any?> {
+            public constructor FooImpl()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+}

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

@@ -31328,6 +31328,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
             }
 
+            @Test
+            @TestMetadata("delegatedConstructor.kt")
+            public void testDelegatedConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/subtyping/delegatedConstructor.kt");
+            }
+
             @Test
             @TestMetadata("extFunctionTypeAsSuperType.kt")
             public void testExtFunctionTypeAsSuperType() throws Exception {