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

K2: fix property VS field resolve in anonymous class case

Browse Source 
Related to KT-55017, KT-50082
This commit is contained in:
Mikhail Glukhikh
2023-01-11 19:56:29 +01:00
committed by teamcity
parent 6a6308bef2
commit f20e5daa92
7 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmPlatformOverloadsConflictResolver.kt
+2 -1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.resolve.calls.jvm
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.fir.containingClassLookupTag
import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.FirField
import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.languageVersionSettings
@@ -84,7 +85,7 @@ class JvmPlatformOverloadsConflictResolver(
private fun ConeClassLikeLookupTag.strictlyDerivedFrom(other: ConeClassLikeLookupTag): Boolean {
if (this == other) return false
val session = inferenceComponents.session
val thisClass = this.toFirRegularClassSymbol(session)?.fir ?: return false
val thisClass = this.toSymbol(session)?.fir as? FirClass ?: return false
return thisClass.isSubclassOf(other, session, isStrict = true)
}