FIR: substitute super type during tower building properly #KT-49301 Fixed

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

@@ -5063,6 +5063,12 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis
                 runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/arrayOfImports.kt");
             }
 
+            @Test
+            @TestMetadata("baseIntrospector.kt")
+            public void testBaseIntrospector() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.kt");
+            }
+
             @Test
             @TestMetadata("DailyAggregatedDoubleFactor.kt")
             public void testDailyAggregatedDoubleFactor() throws Exception {

compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt

@@ -0,0 +1,67 @@
+Module: m1
+FILE: m1.kt
+    package m1
+
+    public abstract interface BasicDatabase : R|kotlin/Any| {
+    }
+    public abstract interface BasicSchema : R|kotlin/Any| {
+    }
+    public abstract class BaseIntrospector<D : R|m1/BasicDatabase|, S : R|m1/BasicSchema|> : R|kotlin/Any| {
+        public constructor<D : R|m1/BasicDatabase|, S : R|m1/BasicSchema|>(): R|m1/BaseIntrospector<D, S>| {
+            super<R|kotlin/Any|>()
+        }
+
+        protected abstract fun createDatabaseRetriever(database: R|D|): R|m1/BaseIntrospector.AbstractDatabaseRetriever<out D, D, S>|
+
+        protected abstract inner class AbstractDatabaseRetriever<D : R|m1/BasicDatabase|, D : R|m1/BasicDatabase|, S : R|m1/BasicSchema|> : R|m1/BaseIntrospector.AbstractRetriever<D, S>| {
+            protected m1/BaseIntrospector<D, S>.constructor<D : R|m1/BasicDatabase|>(database: R|D|): R|m1/BaseIntrospector.AbstractDatabaseRetriever<D, D, S>| {
+                this@R|m1/BaseIntrospector|.super<R|m1/BaseIntrospector.AbstractRetriever<D, S>|>()
+            }
+
+            protected final val database: R|D| = R|<local>/database|
+                protected get(): R|D|
+
+        }
+
+        protected abstract inner class AbstractRetriever<D : R|m1/BasicDatabase|, S : R|m1/BasicSchema|> : R|kotlin/Any| {
+            public m1/BaseIntrospector<D, S>.constructor(): R|m1/BaseIntrospector.AbstractRetriever<D, S>| {
+                super<R|kotlin/Any|>()
+            }
+
+        }
+
+    }
+    public abstract interface BasicSingleDatabase : R|m1/BasicDatabase| {
+    }
+    public abstract interface BasicModSchema : R|m1/BasicSchema| {
+    }
+    public abstract class BaseSingleDatabaseIntrospector<D : R|m1/BasicSingleDatabase|, S : R|m1/BasicModSchema|> : R|m1/BaseIntrospector<D, S>| {
+        protected constructor<D : R|m1/BasicSingleDatabase|, S : R|m1/BasicModSchema|>(): R|m1/BaseSingleDatabaseIntrospector<D, S>| {
+            super<R|m1/BaseIntrospector<D, S>|>()
+        }
+
+    }
+Module: m2
+FILE: m2.kt
+    package m2
+
+    public abstract interface SqliteRoot : R|m1/BasicSingleDatabase| {
+    }
+    public abstract interface SqliteSchema : R|m1/BasicModSchema| {
+    }
+    public final class SqliteIntrospector : R|m1/BaseSingleDatabaseIntrospector<m2/SqliteRoot, m2/SqliteSchema>| {
+        public constructor(): R|m2/SqliteIntrospector| {
+            super<R|m1/BaseSingleDatabaseIntrospector<m2/SqliteRoot, m2/SqliteSchema>|>()
+        }
+
+        protected final override fun createDatabaseRetriever(database: R|m2/SqliteRoot|): R|m1/BaseIntrospector.AbstractDatabaseRetriever<m2/SqliteRoot, m2/SqliteRoot, m2/SqliteSchema>| {
+            ^createDatabaseRetriever object : R|m1/BaseIntrospector.AbstractDatabaseRetriever<m2/SqliteRoot, m2/SqliteRoot, m2/SqliteSchema>| {
+                private constructor(): R|<anonymous>| {
+                    this@R|m2/SqliteIntrospector|.super<R|m1/BaseIntrospector.AbstractDatabaseRetriever<m2/SqliteRoot, m2/SqliteRoot, m2/SqliteSchema>|>(R|<local>/database|)
+                }
+
+            }
+
+        }
+
+    }

compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.kt

@@ -0,0 +1,39 @@
+// MODULE: m1
+// FILE: m1.kt
+
+package m1
+
+interface BasicDatabase
+interface BasicSchema
+
+abstract class BaseIntrospector<D : BasicDatabase, S : BasicSchema> {
+    protected abstract fun createDatabaseRetriever(database: D): AbstractDatabaseRetriever<out D>
+
+    protected abstract inner class AbstractDatabaseRetriever<D : BasicDatabase>
+    protected constructor(protected val database: D)
+        : AbstractRetriever()
+
+    protected abstract inner class AbstractRetriever
+}
+
+interface BasicSingleDatabase : BasicDatabase
+interface BasicModSchema : BasicSchema
+
+abstract class BaseSingleDatabaseIntrospector<D : BasicSingleDatabase, S : BasicModSchema>
+protected constructor() : BaseIntrospector<D, S>()
+
+// MODULE: m2(m1)
+// FILE: m2.kt
+
+package m2
+
+import m1.*
+
+interface SqliteRoot : BasicSingleDatabase
+interface SqliteSchema : BasicModSchema
+
+class SqliteIntrospector : BaseSingleDatabaseIntrospector<SqliteRoot, SqliteSchema>() {
+    override fun createDatabaseRetriever(database: SqliteRoot) =
+        object : AbstractDatabaseRetriever<SqliteRoot>(database) {
+        }
+}

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

@@ -5063,6 +5063,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
                 runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/arrayOfImports.kt");
             }
 
+            @Test
+            @TestMetadata("baseIntrospector.kt")
+            public void testBaseIntrospector() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.kt");
+            }
+
             @Test
             @TestMetadata("DailyAggregatedDoubleFactor.kt")
             public void testDailyAggregatedDoubleFactor() throws Exception {

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

@@ -5063,6 +5063,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
                 runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/arrayOfImports.kt");
             }
 
+            @Test
+            @TestMetadata("baseIntrospector.kt")
+            public void testBaseIntrospector() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.kt");
+            }
+
             @Test
             @TestMetadata("DailyAggregatedDoubleFactor.kt")
             public void testDailyAggregatedDoubleFactor() throws Exception {

compiler/fir/semantics/src/org/jetbrains/kotlin/fir/declarations/ImplicitReceiverUtils.kt

@@ -63,7 +63,7 @@ fun SessionHolder.collectTowerDataElementsForClass(owner: FirClass, defaultType:
     allImplicitCompanionValues.addIfNotNull(companionReceiver)
 
     val superClassesStaticsAndCompanionReceivers = mutableListOf<FirTowerDataElement>()
-    for (superType in lookupSuperTypes(owner, lookupInterfaces = false, deep = true, useSiteSession = session)) {
+    for (superType in lookupSuperTypes(owner, lookupInterfaces = false, deep = true, useSiteSession = session, substituteTypes = true)) {
         val expandedType = superType.fullyExpandedType(session)
         val superClass = expandedType.lookupTag.toSymbol(session)?.fir as? FirRegularClass ?: continue