From 69ec8f2d89c046fdfba860b705e3e2a5b53a0ad6 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 26 Jun 2020 18:01:20 +0300
Subject: [PATCH] [FIR2IR] Allow to get cached symbols in fake override
 generator

---
 .../generators/FakeOverrideGenerator.kt       | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
index 5ccac2d3b97..a62ed9cc0b8 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/FakeOverrideGenerator.kt
@@ -79,11 +79,19 @@ class FakeOverrideGenerator(
                         (functionSymbol.callableId.classId == klass.symbol.classId || fakeOverrideMode == FakeOverrideMode.SUBSTITUTION)
                     ) {
                         // Substitution case
-                        val irFunction = declarationStorage.createIrFunction(
-                            originalFunction, irParent = this,
-                            thisReceiverOwner = declarationStorage.findIrParent(baseSymbol.fir) as? IrClass,
-                            origin = origin
-                        )
+                        // NB: we can get same substituted FIR fake override in a different class, if it derives the same genetic type
+                        // open class Base<T> {
+                        //     fun foo(): T
+                        // }
+                        // class Derived1 : Base<String>() {}
+                        // class Derived2 : Base<String>() {}
+                        // That's why we must check parent during caching...
+                        val irFunction = declarationStorage.getCachedIrFunction(originalFunction)?.takeIf { it.parent == this }
+                            ?: declarationStorage.createIrFunction(
+                                originalFunction, irParent = this,
+                                thisReceiverOwner = declarationStorage.findIrParent(baseSymbol.fir) as? IrClass,
+                                origin = origin
+                            )
                         // In fake overrides, parent logic is a bit specific, because
                         // parent of *original* function (base class) is used for dispatch receiver,
                         // but fake override itself uses parent from its containing (derived) class
@@ -127,11 +135,13 @@ class FakeOverrideGenerator(
                         (propertySymbol.callableId.classId == klass.symbol.classId || fakeOverrideMode == FakeOverrideMode.SUBSTITUTION)
                     ) {
                         // Substitution case
-                        val irProperty = declarationStorage.createIrProperty(
-                            originalProperty, irParent = this,
-                            thisReceiverOwner = declarationStorage.findIrParent(baseSymbol.fir) as? IrClass,
-                            origin = origin
-                        )
+                        // NB: see comment above about substituted function' parent
+                        val irProperty = declarationStorage.getCachedIrProperty(originalProperty)?.takeIf { it.parent == this}
+                            ?: declarationStorage.createIrProperty(
+                                originalProperty, irParent = this,
+                                thisReceiverOwner = declarationStorage.findIrParent(baseSymbol.fir) as? IrClass,
+                                origin = origin
+                            )
                         irProperty.parent = this
                         result += irProperty.withProperty {
                             setOverriddenSymbolsForAccessors(declarationStorage, originalProperty, firOverriddenSymbol = baseSymbol)