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

FIR: Do not check statics in MemberScopeTowerLevel

Browse Source 
Type scopes should not contain them anymore
This commit is contained in:
Denis Zharkov
2020-06-25 12:31:09 +03:00
parent 9668a60151
commit 396c6377f8
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt
+1 -3
View File
@@ -7,10 +7,8 @@ package org.jetbrains.kotlin.fir.resolve.calls.tower
import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirConstructor
import org.jetbrains.kotlin.fir.declarations.isInner import org.jetbrains.kotlin.fir.declarations.isInner
import org.jetbrains.kotlin.fir.declarations.isStatic
import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.builder.buildResolvedQualifier import org.jetbrains.kotlin.fir.expressions.builder.buildResolvedQualifier
import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents
@@ -95,7 +93,7 @@ class MemberScopeTowerLevel(
val fir = candidate.fir val fir = candidate.fir
if (forInnerConstructorDelegationCalls && candidate !is FirConstructorSymbol) { if (forInnerConstructorDelegationCalls && candidate !is FirConstructorSymbol) {
return@processScopeMembers return@processScopeMembers
} else if ((fir as? FirCallableMemberDeclaration<*>)?.isStatic == true || (fir as? FirConstructor)?.isInner == false) { } else if ((fir as? FirConstructor)?.isInner == false) {
return@processScopeMembers return@processScopeMembers
} }
val dispatchReceiverValue = NotNullableReceiverValue(dispatchReceiver) val dispatchReceiverValue = NotNullableReceiverValue(dispatchReceiver)