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

FirElementSerializer cleanup

Browse Source 
Review: https://jetbrains.team/p/kt/reviews/13495/timeline
This commit is contained in:
Nikita Bobko
2023-12-12 18:11:43 +01:00
committed by teamcity
parent ea8f7af1f2
commit 9da29d46aa
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
+7 -15
View File
@@ -411,27 +411,19 @@ class FirElementSerializer private constructor(
): List<T> { ): List<T> {
val foundInScope = buildList { val foundInScope = buildList {
val memberScope = unsubstitutedScope(session, scopeSession, withForcedTypeCalculator = false, memberRequiredPhase = null) val memberScope = unsubstitutedScope(session, scopeSession, withForcedTypeCalculator = false, memberRequiredPhase = null)
processScope(memberScope) l@{ processScope(memberScope) {
val declaration = it.fir as T val declaration = it.fir as T
val dispatchReceiverLookupTag = declaration.dispatchReceiverClassLookupTagOrNull() val dispatchReceiverLookupTag = declaration.dispatchReceiverClassLookupTagOrNull()
// Special case for data/value class equals/hashCode/toString, see KT-57510 // Special case for data/value class equals/hashCode/toString, see KT-57510
val isOverrideOfAnyFunctionInDataOrValueClass = this@collectDeclarations is FirRegularClass && val isFakeOverrideOfAnyFunctionInDataOrValueClass = this@collectDeclarations is FirRegularClass &&
(this@collectDeclarations.isData || this@collectDeclarations.isInline) && (this@collectDeclarations.isData || this@collectDeclarations.isInline) &&
dispatchReceiverLookupTag?.classId == StandardClassIds.Any && !declaration.isFinal dispatchReceiverLookupTag?.classId == StandardClassIds.Any && !declaration.isFinal
if (declaration.isSubstitutionOrIntersectionOverride) { if (isFakeOverrideOfAnyFunctionInDataOrValueClass ||
if (!isOverrideOfAnyFunctionInDataOrValueClass) { !declaration.isSubstitutionOrIntersectionOverride &&
return@l (declaration.isStatic || declaration is FirConstructor || dispatchReceiverLookupTag == this@collectDeclarations.symbol.toLookupTag())
} ) {
} else if (!(declaration.isStatic || declaration is FirConstructor)) { add(declaration)
// non-intersection or substitution fake override
if (dispatchReceiverLookupTag != this@collectDeclarations.symbol.toLookupTag()) {
if (!isOverrideOfAnyFunctionInDataOrValueClass) {
return@l
}
}
} }
add(declaration)
} }
for (declaration in declarations) { for (declaration in declarations) {