From cb345a4c1992867d4a8794fd36bc2df534b6f176 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 1 Jun 2020 15:27:55 +0300
Subject: [PATCH] [FIR mangler] Search for type parameters also in overridden
 declarations

---
 .../kotlin/fir/backend/jvm/FirJvmMangleComputer.kt       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt
index c188b745934..115dbdd3188 100644
--- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt
@@ -153,6 +153,15 @@ open class FirJvmMangleComputer(
             if (this in parent.typeParameters) {
                 return parent
             }
+            if (parent is FirCallableDeclaration<*>) {
+                val overriddenSymbol = parent.symbol.overriddenSymbol
+                if (overriddenSymbol != null) {
+                    val fir = overriddenSymbol.fir
+                    if (fir is FirTypeParametersOwner && this in fir.typeParameters) {
+                        return parent
+                    }
+                }
+            }
         }
         throw IllegalStateException("Should not be here!")
     }