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

[FIR] Resolve ambiguities in Java static scopes

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-01-28 19:28:35 +03:00
parent 4c8905b00f
commit 2bb5740f47
16 changed files with 130 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaScopeProvider.kt
+21 -7
View File
@@ -50,6 +50,14 @@ class JavaScopeProvider(
}
}
private fun buildDeclaredMemberScope(regularClass: FirRegularClass): FirScope {
return if (regularClass is FirJavaClass) declaredMemberScopeWithLazyNestedScope(
regularClass,
existingNames = regularClass.existingNestedClassifierNames,
symbolProvider = symbolProvider
) else declaredMemberScope(regularClass)
}
private fun buildUseSiteMemberScopeWithJavaTypes(
regularClass: FirRegularClass,
useSiteSession: FirSession,
@@ -57,11 +65,7 @@ class JavaScopeProvider(
visitedSymbols: MutableSet<FirClassLikeSymbol<*>>
): JavaClassUseSiteMemberScope {
return scopeSession.getOrBuild(regularClass.symbol, JAVA_USE_SITE) {
val declaredScope = if (regularClass is FirJavaClass) declaredMemberScopeWithLazyNestedScope(
regularClass,
existingNames = regularClass.existingNestedClassifierNames,
symbolProvider = symbolProvider
) else declaredMemberScope(regularClass)
val declaredScope = buildDeclaredMemberScope(regularClass)
val wrappedDeclaredScope = declaredMemberScopeDecorator(regularClass, declaredScope, useSiteSession, scopeSession)
val superTypeEnhancementScopes =
lookupSuperTypes(regularClass, lookupInterfaces = true, deep = false, useSiteSession = useSiteSession)
@@ -97,10 +101,20 @@ class JavaScopeProvider(
useSiteSession: FirSession,
scopeSession: ScopeSession
): FirScope? {
return FirStaticScope(getUseSiteMemberScope(klass, useSiteSession, scopeSession))
if (klass !is FirRegularClass) return null
val enhancementScope = scopeSession.getOrBuild(klass.symbol, JAVA_ENHANCEMENT_FOR_STATIC) {
val declaredScope = buildDeclaredMemberScope(klass)
val wrappedDeclaredScope = declaredMemberScopeDecorator(klass, declaredScope, useSiteSession, scopeSession)
JavaClassEnhancementScope(
useSiteSession, JavaClassUseSiteMemberScope(
klass, useSiteSession, superTypesScope = object : FirScope() {}, declaredMemberScope = wrappedDeclaredScope
)
)
}
return FirStaticScope(enhancementScope)
}
}
private val JAVA_ENHANCEMENT_FOR_STATIC = scopeSessionKey<FirRegularClassSymbol, JavaClassEnhancementScope>()
private val JAVA_ENHANCEMENT = scopeSessionKey<FirRegularClassSymbol, JavaClassEnhancementScope>()
private val JAVA_USE_SITE = scopeSessionKey<FirRegularClassSymbol, JavaClassUseSiteMemberScope>()
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt
+77 -13
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.fir.resolve.calls
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.FirTypeParametersOwner
import org.jetbrains.kotlin.fir.declarations.expandedConeType
import org.jetbrains.kotlin.fir.declarations.impl.FirClassImpl
@@ -17,6 +18,7 @@ import org.jetbrains.kotlin.fir.references.impl.FirImplicitThisReference
import org.jetbrains.kotlin.fir.renderWithType
import org.jetbrains.kotlin.fir.resolve.*
import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
import org.jetbrains.kotlin.fir.scopes.impl.*
import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.impl.*
@@ -24,6 +26,7 @@ import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl
import org.jetbrains.kotlin.name.ClassId
import java.util.ArrayDeque
interface Receiver {
fun scope(useSiteSession: FirSession, scopeSession: ScopeSession): FirScope?
@@ -68,31 +71,81 @@ abstract class AbstractExplicitReceiverValue<E : FirExpression> : AbstractExplic
}
class QualifierReceiver(override val explicitReceiver: FirResolvedQualifier) : AbstractExplicitReceiver<FirResolvedQualifier>() {
private fun getClassSymbolWithCallablesScope(
private fun collectSuperTypeScopesComposedByDepth(
klass: FirClass<*>,
useSiteSession: FirSession,
scopeSession: ScopeSession
): List<FirScope> {
val result = mutableListOf<FirScope>()
val provider = klass.scopeProvider
val levelScopes = mutableListOf<FirScope>()
var currentDepth = 1
val queue = ArrayDeque<Pair<ConeClassLikeType, Int>>()
queue.addAll(
lookupSuperTypes(klass, lookupInterfaces = true, deep = false, useSiteSession = useSiteSession).map { it to 1 }
)
val visitedSymbols = mutableSetOf<FirRegularClassSymbol>()
while (queue.isNotEmpty()) {
val (useSiteSuperType, depth) = queue.poll()
if (depth > currentDepth) {
currentDepth = depth
result += FirCompositeScope(levelScopes.toMutableList())
levelScopes.clear()
}
if (useSiteSuperType is ConeClassErrorType) continue
val superTypeSymbol = useSiteSuperType.lookupTag.toSymbol(useSiteSession) as? FirRegularClassSymbol
?: continue
if (!visitedSymbols.add(superTypeSymbol)) continue
val superTypeScope = provider.getStaticMemberScopeForCallables(
superTypeSymbol.fir, useSiteSession, scopeSession
)
if (superTypeScope != null) {
levelScopes += superTypeScope
}
queue.addAll(
lookupSuperTypes(
superTypeSymbol.fir, lookupInterfaces = true, deep = false, useSiteSession = useSiteSession
).map { it to currentDepth + 1 }
)
}
return result
}
private fun getClassSymbolWithCallableScopes(
classId: ClassId,
useSiteSession: FirSession,
scopeSession: ScopeSession
): Pair<FirClassSymbol<*>?, FirScope?> {
val symbol = useSiteSession.firSymbolProvider.getClassLikeSymbolByFqName(classId) ?: return null to null
): Pair<FirClassSymbol<*>?, List<FirScope>> {
val symbol = useSiteSession.firSymbolProvider.getClassLikeSymbolByFqName(classId) ?: return null to emptyList()
if (symbol is FirTypeAliasSymbol) {
val expansionSymbol = symbol.fir.expandedConeType?.lookupTag?.toSymbol(useSiteSession)
if (expansionSymbol != null) {
return getClassSymbolWithCallablesScope(expansionSymbol.classId, useSiteSession, scopeSession)
return getClassSymbolWithCallableScopes(expansionSymbol.classId, useSiteSession, scopeSession)
}
} else {
return (symbol as? FirClassSymbol<*>)?.let { klassSymbol ->
val klass = klassSymbol.fir
klassSymbol to klass.scopeProvider.getStaticMemberScopeForCallables(klass, useSiteSession, scopeSession)
} ?: (null to null)
klassSymbol to run {
val result = mutableListOf<FirScope>()
val provider = klass.scopeProvider
val klassScope = provider.getStaticMemberScopeForCallables(klass, useSiteSession, scopeSession)
if (klassScope != null) {
result += klassScope
if (provider is KotlinScopeProvider) return@run result
result += collectSuperTypeScopesComposedByDepth(klass, useSiteSession, scopeSession)
}
result
}
} ?: (null to emptyList())
}
return null to null
return null to emptyList()
}
fun qualifierScope(useSiteSession: FirSession, scopeSession: ScopeSession): FirScope? {
val classId = explicitReceiver.classId ?: return null
fun qualifierScopes(useSiteSession: FirSession, scopeSession: ScopeSession): List<FirScope> {
val classId = explicitReceiver.classId ?: return emptyList()
val (classSymbol, callablesScope) = getClassSymbolWithCallablesScope(classId, useSiteSession, scopeSession)
val (classSymbol, callableScopes) = getClassSymbolWithCallableScopes(classId, useSiteSession, scopeSession)
if (classSymbol != null) {
val klass = classSymbol.fir
val classifierScope = if (klass is FirClassImpl || klass is FirSealedClassImpl) {
@@ -101,13 +154,24 @@ class QualifierReceiver(override val explicitReceiver: FirResolvedQualifier) : A
useSiteSession.firSymbolProvider.getNestedClassifierScope(classId)
}
return FirQualifierScope(callablesScope, classifierScope)
return when {
classifierScope == null -> {
callableScopes.map { FirQualifierScope(it, null) }
}
callableScopes.isEmpty() -> {
listOf(FirQualifierScope(null, classifierScope))
}
else -> {
listOf(FirQualifierScope(callableScopes.first(), classifierScope)) +
callableScopes.drop(1).map { FirQualifierScope(it, null) }
}
}
}
return null
return emptyList()
}
override fun scope(useSiteSession: FirSession, scopeSession: ScopeSession): FirScope? {
return qualifierScope(useSiteSession, scopeSession)
return FirCompositeScope(qualifierScopes(useSiteSession, scopeSession).toMutableList())
}
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirTowerResolver.kt
+14 -12
View File
@@ -82,23 +82,25 @@ class FirTowerResolver(
resolvedQualifier: FirResolvedQualifier,
manager: TowerResolveManager
): CandidateCollector {
val qualifierScope = if (resolvedQualifier.classId == null) {
FirExplicitSimpleImportingScope(
listOf(
FirResolvedImportImpl(
FirImportImpl(source = null, importedFqName = FqName.topLevel(info.name), isAllUnder = false, aliasName = null),
resolvedQualifier.packageFqName,
relativeClassName = null
)
), session, components.scopeSession
val qualifierScopes = if (resolvedQualifier.classId == null) {
listOf(
FirExplicitSimpleImportingScope(
listOf(
FirResolvedImportImpl(
FirImportImpl(source = null, importedFqName = FqName.topLevel(info.name), isAllUnder = false, aliasName = null),
resolvedQualifier.packageFqName,
relativeClassName = null
)
), session, components.scopeSession
)
)
} else {
QualifierReceiver(resolvedQualifier).qualifierScope(session, components.scopeSession)
QualifierReceiver(resolvedQualifier).qualifierScopes(session, components.scopeSession)
}
if (qualifierScope != null) {
for ((depth, qualifierScope) in qualifierScopes.withIndex()) {
manager.processLevel(
ScopeTowerLevel(session, components, qualifierScope), info.noStubReceiver(), TowerGroup.Qualifier
ScopeTowerLevel(session, components, qualifierScope), info.noStubReceiver(), TowerGroup.Qualifier(depth)
)
if (collector.isSuccess()) return collector
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerGroup.kt
+2 -4
View File
@@ -12,7 +12,7 @@ sealed class TowerGroupKind(private val index: Int) : Comparable<TowerGroupKind>
class Weakened(depth: Int) : WithDepth(-10, depth)
object Qualifier : TowerGroupKind(0)
class Qualifier(depth: Int) : WithDepth(0, depth)
class TopPrioritized(depth: Int) : WithDepth(1, depth)
@@ -47,7 +47,7 @@ class TowerGroup private constructor(private val list: List<TowerGroupKind>) : C
val Start = kindOf(TowerGroupKind.Start)
val Qualifier = kindOf(TowerGroupKind.Qualifier)
fun Qualifier(depth: Int) = kindOf(TowerGroupKind.Qualifier(depth))
val Member = kindOf(TowerGroupKind.Member)
@@ -68,8 +68,6 @@ class TowerGroup private constructor(private val list: List<TowerGroupKind>) : C
fun Weakened(depth: Int) = kindOf(TowerGroupKind.Weakened(depth))
val Qualifier get() = kindOf(TowerGroupKind.Qualifier)
val Member get() = kindOf(TowerGroupKind.Member)
fun Local(depth: Int) = kindOf(TowerGroupKind.Local(depth))
compiler/fir/resolve/testData/resolve/problems/javaStaticScopeInheritance.kt
Vendored
+1 -1
View File
@@ -13,5 +13,5 @@ class B extends A {
// FILE: main.kt
fun main() {
val b = B.<!AMBIGUITY!>VALUE<!> // <- should be B
val b = B.VALUE // <- should be B
}
compiler/fir/resolve/testData/resolve/problems/javaStaticScopeInheritance.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: main.kt
public final fun main(): R|kotlin/Unit| {
lval b: <ERROR TYPE REF: Ambiguity: VALUE, [/B.VALUE, /A.VALUE]> = Q|B|.<Ambiguity: VALUE, [/B.VALUE, /A.VALUE]>#
lval b: R|ft<B, B?>!| = Q|B|.R|/B.VALUE|
}
compiler/testData/codegen/box/statics/fields.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// FILE: Child.java
compiler/testData/diagnostics/tests/deprecated/javaDeprecatedInheritance.fir.kt
Vendored
+1 -1
View File
@@ -44,7 +44,7 @@ fun use(a: A, b: B, c: C) {
c.f()
A.D
B.<!AMBIGUITY!>D<!>
B.D
C.D
A.bar()
compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.fir.kt
Vendored
+1 -1
View File
@@ -13,4 +13,4 @@ public class Bbb extends Aaa {
// FILE: b.kt
fun foo() = Bbb.<!AMBIGUITY!>i<!>
fun foo() = Bbb.i
compiler/testData/diagnostics/tests/j+k/shadowingPrimitiveStaticField.fir.kt
Vendored
+3 -3
View File
@@ -4,9 +4,9 @@ import aa.B
fun use() {
// checking that CONST is of platform type
B.<!AMBIGUITY!>CONST<!> = null
B.<!AMBIGUITY!>CONST<!>?.<!UNRESOLVED_REFERENCE!>length<!>
B.<!AMBIGUITY!>CONST<!>.<!UNRESOLVED_REFERENCE!>length<!>
B.CONST = null
B.CONST?.length
B.CONST.length
}
// FILE: aa/A.java
compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.fir.kt
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@ fun test() {
B.a
B.foo()
B.foo(1)
B.<!AMBIGUITY!>b<!>
B.b
B.bar()
B.bar(1)
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash0.fir.kt
Vendored
+1 -1
View File
@@ -28,5 +28,5 @@ fun test() {
B.field
E.<!AMBIGUITY!>field<!>
O.<!AMBIGUITY!>field<!>
O.field
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash1.fir.kt
Vendored
+2 -2
View File
@@ -25,8 +25,8 @@ public class O implements A, B {
fun test() {
A.field
B.<!AMBIGUITY!>field<!>
B.field
E.<!AMBIGUITY!>field<!>
O.<!AMBIGUITY!>field<!>
O.field
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash2.fir.kt
Vendored
+3 -3
View File
@@ -57,10 +57,10 @@ fun test() {
D.field
E.<!AMBIGUITY!>field<!>
O.<!AMBIGUITY!>field<!>
O.field
EE.<!AMBIGUITY!>field<!>
EO.<!AMBIGUITY!>field<!>
EO.field
OO.<!AMBIGUITY!>field<!>
OO.field
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/oneInterfaceManyTimes.fir.kt
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ fun test() {
D.bar()
D.baz()
E.<!AMBIGUITY!>a<!>
E.a
E.b
E.c
E.bar()
compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
Vendored
+1 -1
View File
@@ -26,5 +26,5 @@ public class StaticOverrides {
fun test() {
StaticOverrides.A.<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Boolean>() }
StaticOverrides.B.foo {} checkType { <!UNRESOLVED_REFERENCE!>_<!><String>() }
StaticOverrides.C.<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Boolean>() }
StaticOverrides.C.foo {} checkType { <!UNRESOLVED_REFERENCE!>_<!><Boolean>() }
}