From 396c6377f8fe453b0fa12ed06017b0c572830196 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 25 Jun 2020 12:31:09 +0300 Subject: [PATCH] FIR: Do not check statics in MemberScopeTowerLevel Type scopes should not contain them anymore --- .../jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt index 9b950fffe3a..9d59e774898 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt @@ -7,10 +7,8 @@ package org.jetbrains.kotlin.fir.resolve.calls.tower import org.jetbrains.kotlin.descriptors.ClassKind 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.isInner -import org.jetbrains.kotlin.fir.declarations.isStatic import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.buildResolvedQualifier import org.jetbrains.kotlin.fir.resolve.BodyResolveComponents @@ -95,7 +93,7 @@ class MemberScopeTowerLevel( val fir = candidate.fir if (forInnerConstructorDelegationCalls && candidate !is FirConstructorSymbol) { return@processScopeMembers - } else if ((fir as? FirCallableMemberDeclaration<*>)?.isStatic == true || (fir as? FirConstructor)?.isInner == false) { + } else if ((fir as? FirConstructor)?.isInner == false) { return@processScopeMembers } val dispatchReceiverValue = NotNullableReceiverValue(dispatchReceiver)