azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR Java] Drop nasty code providing type parameter erasure

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-10-13 15:59:44 +03:00
parent 999627952a
commit 17de486c23
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt
-8
View File
@@ -29,14 +29,6 @@ class JavaOverrideChecker internal constructor(
if (candidateType is ConeClassLikeType && baseType is ConeClassLikeType) { if (candidateType is ConeClassLikeType && baseType is ConeClassLikeType) {
return candidateType.lookupTag.classId.let { it.readOnlyToMutable() ?: it } == baseType.lookupTag.classId.let { it.readOnlyToMutable() ?: it } 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) { return with(context) {
areEqualTypeConstructors( areEqualTypeConstructors(
substitutor.substituteOrSelf(candidateType).typeConstructor(), substitutor.substituteOrSelf(candidateType).typeConstructor(),