From 17de486c23951369b35990ffdccb35548ff42224 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 13 Oct 2020 15:59:44 +0300 Subject: [PATCH] [FIR Java] Drop nasty code providing type parameter erasure --- .../kotlin/fir/java/scopes/JavaOverrideChecker.kt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt index e501d725acf..9fd6c1b6178 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt @@ -29,14 +29,6 @@ class JavaOverrideChecker internal constructor( if (candidateType is ConeClassLikeType && baseType is ConeClassLikeType) { return candidateType.lookupTag.classId.let { it.readOnlyToMutable() ?: it } == baseType.lookupTag.classId.let { it.readOnlyToMutable() ?: it } } - if (candidateType is ConeClassLikeType && baseType is ConeTypeParameterType) { - val boundType = baseType.lookupTag.typeParameterSymbol.fir.bounds.singleOrNull()?.toConeKotlinTypeProbablyFlexible( - session, javaTypeParameterStack - ) - if (boundType != null) { - return isEqualTypes(candidateType, boundType, substitutor) - } - } return with(context) { areEqualTypeConstructors( substitutor.substituteOrSelf(candidateType).typeConstructor(),