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

FIR declared member scope: remove constructors from callable index

Browse Source 
This removes constructor resolve ambiguity in some cases.
Now constructors are resolved only via classifiers
This commit is contained in:
Mikhail Glukhikh
2019-11-19 17:48:33 +03:00
parent bd71d1dc3f
commit d39a36ee25
8 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirTowerResolver.kt
+4 -3
View File
@@ -46,7 +46,7 @@ class FirTowerResolver(
// }
towerDataConsumer.consume(
TOWER_LEVEL,
MemberScopeTowerLevel(session, implicitReceiverValue, scopeSession = components.scopeSession),
MemberScopeTowerLevel(session, components, implicitReceiverValue, scopeSession = components.scopeSession),
group++
)
@@ -57,7 +57,7 @@ class FirTowerResolver(
// }
towerDataConsumer.consume(
TOWER_LEVEL,
MemberScopeTowerLevel(session, implicitReceiverValue, implicitReceiverValue, components.scopeSession),
MemberScopeTowerLevel(session, components, implicitReceiverValue, implicitReceiverValue, components.scopeSession),
group++
)
@@ -127,7 +127,8 @@ class FirTowerResolver(
towerDataConsumer.consume(
TOWER_LEVEL,
MemberScopeTowerLevel(
session, scopeSession = components.scopeSession,
session, components,
scopeSession = components.scopeSession,
dispatchReceiver = implicitDispatchReceiverValue,
implicitExtensionReceiver = implicitReceiverValue
),
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerDataConsumers.kt
+8 -7
View File
@@ -171,13 +171,14 @@ class ExplicitReceiverTowerDataConsumer<T : AbstractFirBasedSymbol<*>>(
if (skipGroup(group, resultCollector)) return ProcessorAction.NEXT
return when (kind) {
TowerDataKind.EMPTY ->
MemberScopeTowerLevel(session, explicitReceiver, scopeSession = candidateFactory.bodyResolveComponents.scopeSession)
.processElementsByName(
token,
name,
explicitReceiver = null,
processor = EmptyKindTowerProcessor(group)
)
MemberScopeTowerLevel(
session, resultCollector.components, explicitReceiver, scopeSession = candidateFactory.bodyResolveComponents.scopeSession
).processElementsByName(
token,
name,
explicitReceiver = null,
processor = EmptyKindTowerProcessor(group)
)
TowerDataKind.TOWER_LEVEL -> {
if (token == TowerScopeLevel.Token.Objects) return ProcessorAction.NEXT
towerScopeLevel.processElementsByName(
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TowerLevels.kt
+2 -1
View File
@@ -86,6 +86,7 @@ abstract class SessionBasedTowerLevel(val session: FirSession) : TowerScopeLevel
// or given implicit or explicit receiver, otherwise
class MemberScopeTowerLevel(
session: FirSession,
val bodyResolveComponents: BodyResolveComponents,
val dispatchReceiver: ReceiverValue,
val implicitExtensionReceiver: ImplicitReceiverValue<*>? = null,
val scopeSession: ScopeSession
@@ -128,7 +129,7 @@ class MemberScopeTowerLevel(
this.processPropertiesByName(name, symbol.cast())
}
TowerScopeLevel.Token.Functions -> processMembers(processor, explicitExtensionReceiver) { symbol ->
this.processFunctionsByName(name, symbol.cast())
this.processFunctionsAndConstructorsByName(name, session, bodyResolveComponents, symbol.cast())
}
TowerScopeLevel.Token.Objects -> processMembers(processor, explicitExtensionReceiver) { symbol ->
this.processClassifiersByName(name, symbol.cast())
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
-7
View File
@@ -37,13 +37,6 @@ class FirClassDeclaredMemberScope(klass: FirClass<*>, useLazyNestedClassifierSco
}
result.getOrPut(name) { mutableListOf() } += declaration.symbol
}
is FirRegularClass -> {
for (nestedDeclaration in declaration.declarations) {
if (nestedDeclaration is FirConstructor) {
result.getOrPut(declaration.name) { mutableListOf() } += nestedDeclaration.symbol
}
}
}
}
}
result
compiler/fir/resolve/testData/resolve/problems/nestedClassContructor.kt
Vendored
+22 -2
View File
@@ -2,8 +2,28 @@
* We see same constructor of `B` in two scopes
*/
class A() {
open class A() {
class B() : A() {
fun copy() = <!AMBIGUITY!>B<!>()
fun copy() = B()
}
open class C() {
fun copy() = C()
}
}
class D : A.C() {
fun foo() {
val a = A()
val ac = A.C()
val c = <!UNRESOLVED_REFERENCE!>C<!>() // shouldn't resolve
}
}
class E : A() {
fun foo() {
val a = A()
val c = C()
}
}
compiler/fir/resolve/testData/resolve/problems/nestedClassContructor.txt
Vendored
+37 -3
View File
@@ -1,5 +1,5 @@
FILE: nestedClassContructor.kt
public final class A : R|kotlin/Any| {
public open class A : R|kotlin/Any| {
public constructor(): R|A| {
super<R|kotlin/Any|>()
}
@@ -9,10 +9,44 @@ FILE: nestedClassContructor.kt
super<R|A|>()
}
public final fun copy(): <ERROR TYPE REF: Ambiguity: B, [/A.B.B, /A.B.B]> {
^copy <Ambiguity: B, [/A.B.B, /A.B.B]>#()
public final fun copy(): R|A.B| {
^copy R|/A.B.B|()
}
}
public open class C : R|kotlin/Any| {
public constructor(): R|A.C| {
super<R|kotlin/Any|>()
}
public final fun copy(): R|A.C| {
^copy R|/A.C.C|()
}
}
}
public final class D : R|A.C| {
public constructor(): R|D| {
super<R|A.C|>()
}
public final fun foo(): R|kotlin/Unit| {
lval a: R|A| = R|/A.A|()
lval ac: R|A.C| = Q|A|.R|/A.C.C|()
lval c: <ERROR TYPE REF: Unresolved name: C> = <Unresolved name: C>#()
}
}
public final class E : R|A| {
public constructor(): R|E| {
super<R|A|>()
}
public final fun foo(): R|kotlin/Unit| {
lval a: R|A| = R|/A.A|()
lval c: R|A.C| = R|/A.C.C|()
}
}
compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt
Vendored
+4 -3
View File
@@ -4,10 +4,11 @@ FILE fqName:<root> fileName:/constructorWithOwnTypeParametersCall.kt
RETURN type=kotlin.Nothing from='public final fun testKotlin (): <root>.K1.K2<kotlin.String> declared in <root>'
CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.K1.K2' type=<root>.K1.K2<kotlin.String> origin=null
<class: T2>: <none>
FUN name:testJava visibility:public modality:FINAL <> () returnType:IrErrorType
FUN name:testJava visibility:public modality:FINAL <> () returnType:<root>.J1.J2<kotlin.Double>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun testJava (): IrErrorType declared in <root>'
ERROR_CALL 'Unresolved reference: <Unresolved name: J2>#' type=IrErrorType
RETURN type=kotlin.Nothing from='public final fun testJava (): <root>.J1.J2<kotlin.Double> declared in <root>'
CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J1.J2' type=<root>.J1.J2<kotlin.Double> origin=null
<class: X2>: <none>
CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1
TYPE_PARAMETER name:T1 index:0 variance: superTypes:[]
compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.txt
Vendored
+9 -7
View File
@@ -10,14 +10,16 @@ FILE fqName:<root> fileName:/javaConstructorWithTypeParameters.kt
CONSTRUCTOR_CALL 'public constructor <init> (x1: X1 of <uninitialized parent>?) declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
<class: T1>: <none>
x1: CONST Int type=kotlin.Int value=1
FUN name:test3 visibility:public modality:FINAL <> (j1:<root>.J1<kotlin.Any>) returnType:IrErrorType
FUN name:test3 visibility:public modality:FINAL <> (j1:<root>.J1<kotlin.Any>) returnType:<root>.J1.J2<kotlin.Int>
VALUE_PARAMETER name:j1 index:0 type:<root>.J1<kotlin.Any>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun test3 (j1: <root>.J1<kotlin.Any>): IrErrorType declared in <root>'
ERROR_CALL 'Unresolved reference: <Unresolved name: J2>#' type=IrErrorType
FUN name:test4 visibility:public modality:FINAL <> (j1:<root>.J1<kotlin.Any>) returnType:IrErrorType
RETURN type=kotlin.Nothing from='public final fun test3 (j1: <root>.J1<kotlin.Any>): <root>.J1.J2<kotlin.Int> declared in <root>'
CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J1.J2' type=<root>.J1.J2<kotlin.Int> origin=null
<class: T2>: <none>
FUN name:test4 visibility:public modality:FINAL <> (j1:<root>.J1<kotlin.Any>) returnType:<root>.J1.J2<kotlin.Int>
VALUE_PARAMETER name:j1 index:0 type:<root>.J1<kotlin.Any>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun test4 (j1: <root>.J1<kotlin.Any>): IrErrorType declared in <root>'
ERROR_CALL 'Unresolved reference: <Unresolved name: J2>#' type=IrErrorType
CONST Int type=kotlin.Int value=1
RETURN type=kotlin.Nothing from='public final fun test4 (j1: <root>.J1<kotlin.Any>): <root>.J1.J2<kotlin.Int> declared in <root>'
CONSTRUCTOR_CALL 'public constructor <init> (x2: X2 of <uninitialized parent>?) declared in <root>.J1.J2' type=<root>.J1.J2<kotlin.Int> origin=null
<class: T2>: <none>
x2: CONST Int type=kotlin.Int value=1