[FIR] look at intersectionOverride during override processing
This commit fixes some BB tests broken by previous commit
This commit is contained in:
+7
-2
@@ -295,8 +295,13 @@ class FirTypeIntersectionScope private constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
private fun <S : FirCallableSymbol<*>> getDirectOverriddenSymbols(symbol: S): Collection<S> =
|
private fun <S : FirCallableSymbol<*>> getDirectOverriddenSymbols(symbol: S): Collection<S> {
|
||||||
overriddenSymbols[symbol].orEmpty() as Collection<S>
|
val intersectionOverride = intersectionOverrides[symbol]
|
||||||
|
val allDirectOverridden = overriddenSymbols[symbol].orEmpty() + intersectionOverride?.let {
|
||||||
|
overriddenSymbols[it]
|
||||||
|
}.orEmpty()
|
||||||
|
return allDirectOverridden as Collection<S>
|
||||||
|
}
|
||||||
|
|
||||||
override fun processOverriddenFunctionsWithDepth(
|
override fun processOverriddenFunctionsWithDepth(
|
||||||
functionSymbol: FirFunctionSymbol<*>,
|
functionSymbol: FirFunctionSymbol<*>,
|
||||||
|
|||||||
Reference in New Issue
Block a user