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

[FIR] Update all required places according to changed overridden processing contract

Browse Source 
This commit fixes all places that relied on the contract described in
  the previous commit and also updates corresponding tests

^KT-63738
This commit is contained in:
Dmitriy Novozhilov
2023-12-06 15:51:55 +02:00
committed by Space Team
parent 4272f2e156
commit 385bff3be1
18 changed files with 101 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsNameClashClassMembersChecker.kt
+8 -7
View File
@@ -37,15 +37,16 @@ object FirJsNameClashClassMembersChecker : FirClassChecker() {
private val allSymbols = mutableSetOf<FirCallableSymbol<*>>()
private fun FirTypeScope.collectOverriddenLeaves(classMemberSymbol: FirCallableSymbol<*>): Set<FirCallableSymbol<*>> {
val visitedSymbols = hashSetOf(classMemberSymbol)
val symbolsToProcess = mutableListOf(classMemberSymbol)
val startMemberWithScope = MemberWithBaseScope(classMemberSymbol, this)
val visitedSymbols = hashSetOf(startMemberWithScope)
val symbolsToProcess = mutableListOf(startMemberWithScope)
val leaves = mutableSetOf<FirCallableSymbol<*>>()
while (symbolsToProcess.isNotEmpty()) {
val processingSymbol = symbolsToProcess.popLast()
val overriddenMembers = getDirectOverriddenMembers(processingSymbol, true)
for (overriddenMember in overriddenMembers) {
if (visitedSymbols.add(overriddenMember)) {
symbolsToProcess.add(overriddenMember)
val (processingSymbol, scope) = symbolsToProcess.popLast()
val overriddenMembers = scope.getDirectOverriddenMembersWithBaseScope(processingSymbol)
for (overriddenMemberWithScope in overriddenMembers) {
if (visitedSymbols.add(overriddenMemberWithScope)) {
symbolsToProcess.add(overriddenMemberWithScope)
}
}
if (overriddenMembers.isEmpty()) {