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

FIR: delegate to abstract override members of Any

Browse Source
This commit is contained in:
Jinseong Jeon
2021-02-16 14:14:10 -08:00
committed by Mikhail Glukhikh
parent 0defdc9e70
commit 338595703c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
+7 -2
View File
@@ -35,12 +35,17 @@ class FirDelegatedMemberScope(
override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) { override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) {
useSiteScope.processFunctionsByName(name) processor@{ functionSymbol -> useSiteScope.processFunctionsByName(name) processor@{ functionSymbol ->
if (functionSymbol.fir.isPublicInAny()) { val original = functionSymbol.fir
// KT-6014: If the original is abstract, we still need a delegation
// For example,
// interface IBase { override fun toString(): String }
// object BaseImpl : IBase { override fun toString(): String = ... }
// class Test : IBase by BaseImpl
if (original.isPublicInAny() && original.modality != Modality.ABSTRACT) {
processor(functionSymbol) processor(functionSymbol)
return@processor return@processor
} }
val original = functionSymbol.fir
if (original.modality == Modality.FINAL || original.visibility == Visibilities.Private) { if (original.modality == Modality.FINAL || original.visibility == Visibilities.Private) {
processor(functionSymbol) processor(functionSymbol)
return@processor return@processor