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

K2: use unsubstituted scope to search for equals in FirDataFlowAnalyzer

Browse Source 
#KT-60436 Fixed
This commit is contained in:
Mikhail Glukhikh
2023-07-14 09:29:24 +02:00
committed by Space Team
parent 00b4ae6ae9
commit 7a69f13fd6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+7 -4
View File
@@ -28,8 +28,8 @@ import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirAbstractBod
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.resultType
import org.jetbrains.kotlin.fir.resolve.transformers.unwrapAnonymousFunctionExpression
import org.jetbrains.kotlin.fir.scopes.getFunctions
import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
import org.jetbrains.kotlin.fir.scopes.impl.toConeType
import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.*
@@ -534,9 +534,12 @@ abstract class FirDataFlowAnalyzer(
// return true
// }
return session.declaredMemberScope(this, memberRequiredPhase = FirResolvePhase.STATUS)
.getFunctions(OperatorNameConventions.EQUALS)
.any { it.fir.isEquals(session) }
return this.unsubstitutedScope(
session, components.scopeSession, withForcedTypeCalculator = false, memberRequiredPhase = FirResolvePhase.STATUS
).getFunctions(OperatorNameConventions.EQUALS).any {
!it.isSubstitutionOrIntersectionOverride && it.fir.isEquals(session) &&
it.dispatchReceiverClassLookupTagOrNull() == this.toLookupTag()
}
}
// ----------------------------------- Jump -----------------------------------