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

[FIR] Pass proper containing classes from context to type resolution for local classes

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-11-25 13:33:01 +03:00
committed by teamcityserver
parent 98934e15c0
commit 2b84e8e68f
10 changed files with 114 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -32281,6 +32281,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/visibility/privateDeclarationInAnotherFile.kt");
}
@Test
@TestMetadata("privateFromInAnonymousObject.kt")
public void testPrivateFromInAnonymousObject() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/privateFromInAnonymousObject.kt");
}
@Test
@TestMetadata("protectedInternal.kt")
public void testProtectedInternal() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -32281,6 +32281,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/visibility/privateDeclarationInAnotherFile.kt");
}
@Test
@TestMetadata("privateFromInAnonymousObject.kt")
public void testPrivateFromInAnonymousObject() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/privateFromInAnonymousObject.kt");
}
@Test
@TestMetadata("protectedInternal.kt")
public void testProtectedInternal() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -32281,6 +32281,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/visibility/privateDeclarationInAnotherFile.kt");
}
@Test
@TestMetadata("privateFromInAnonymousObject.kt")
public void testPrivateFromInAnonymousObject() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/privateFromInAnonymousObject.kt");
}
@Test
@TestMetadata("protectedInternal.kt")
public void testProtectedInternal() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
+14 -4
View File
@@ -33,8 +33,17 @@ fun <F : FirClassLikeDeclaration> F.runTypeResolvePhaseForLocalClass(
session: FirSession,
scopeSession: ScopeSession,
currentScopeList: List<FirScope>,
useSiteFile: FirFile,
containingDeclarations: List<FirDeclaration>,
): F {
val transformer = FirTypeResolveTransformer(session, scopeSession, currentScopeList)
@Suppress("RemoveExplicitTypeArguments")
val transformer = FirTypeResolveTransformer(
session,
scopeSession,
currentScopeList,
initialCurrentFile = useSiteFile,
classDeclarationsStack = containingDeclarations.filterIsInstanceTo<FirClass, ArrayDeque<FirClass>>(ArrayDeque())
)
return this.transform<F, Nothing?>(transformer, null)
}
@@ -42,9 +51,10 @@ fun <F : FirClassLikeDeclaration> F.runTypeResolvePhaseForLocalClass(
open class FirTypeResolveTransformer(
final override val session: FirSession,
private val scopeSession: ScopeSession,
initialScopes: List<FirScope> = emptyList()
initialScopes: List<FirScope> = emptyList(),
initialCurrentFile: FirFile? = null,
private val classDeclarationsStack: ArrayDeque<FirClass> = ArrayDeque()
) : FirAbstractTreeTransformer<Any?>(FirResolvePhase.TYPES) {
private val classDeclarationsStack = ArrayDeque<FirClass>()
private val scopes = mutableListOf<FirScope>()
private val towerScope = scopes.asReversed()
@@ -53,7 +63,7 @@ open class FirTypeResolveTransformer(
}
private val typeResolverTransformer: FirSpecificTypeResolverTransformer = FirSpecificTypeResolverTransformer(session)
private var currentFile: FirFile? = null
private var currentFile: FirFile? = initialCurrentFile
override fun transformFile(file: FirFile, data: Any?): FirFile {
checkSessionConsistency(file)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt
+2
View File
@@ -338,6 +338,8 @@ class BodyResolveContext(
towerDataContextForAnonymousFunctions.putAll(this@BodyResolveContext.towerDataContextForAnonymousFunctions)
towerDataContextForCallableReferences.putAll(this@BodyResolveContext.towerDataContextForCallableReferences)
containers = this@BodyResolveContext.containers
containingClassDeclarations = ArrayDeque(this@BodyResolveContext.containingClassDeclarations)
containingClass = this@BodyResolveContext.containingClass
replaceTowerDataContext(this@BodyResolveContext.towerDataContext)
anonymousFunctionsAnalyzedInDependentContext.addAll(this@BodyResolveContext.anonymousFunctionsAnalyzedInDependentContext)
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/LocalClassesResolution.kt
+3 -1
View File
@@ -44,7 +44,9 @@ fun <F : FirClassLikeDeclaration> F.runAllPhasesForLocalClass(
runTypeResolvePhaseForLocalClass(
components.session,
components.scopeSession,
components.createCurrentScopeList()
components.createCurrentScopeList(),
components.file,
components.containingDeclarations
)
runStatusResolveForLocalClass(
components.session,
compiler/testData/diagnostics/tests/visibility/privateFromInAnonymousObject.fir.txt
Vendored
+35
View File
@@ -0,0 +1,35 @@
FILE: privateFromInAnonymousObject.kt
public final class Base : R|kotlin/Any| {
public constructor(): R|Base| {
super<R|kotlin/Any|>()
}
private final class Private : R|kotlin/Any| {
public constructor(): R|Base.Private| {
super<R|kotlin/Any|>()
}
}
public final fun test(): R|kotlin/Unit| {
object : R|kotlin/Any| {
private constructor(): R|<anonymous>| {
super<R|kotlin/Any|>()
}
public final val x: R|Base.Private| = R|/Base.Private.Private|()
public get(): R|Base.Private|
init {
lval y: R|Base.Private| = R|/Base.Private.Private|()
}
public final fun foo(): R|kotlin/Unit| {
lval z: R|Base.Private| = R|/Base.Private.Private|()
}
}
}
}
compiler/testData/diagnostics/tests/visibility/privateFromInAnonymousObject.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// FIR_IDENTICAL
// FIR_DUMP
class Base {
private class Private
fun test() {
object {
val x: Private = Private()
init {
val y: Private = Private()
}
fun foo() {
val z: Private = Private()
}
}
}
}
compiler/testData/diagnostics/tests/visibility/privateFromInAnonymousObject.txt
Vendored
+16
View File
@@ -0,0 +1,16 @@
package
public final class Base {
public constructor Base()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final fun test(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
private final class Private {
public constructor Private()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -32377,6 +32377,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/visibility/privateDeclarationInAnotherFile.kt");
}
@Test
@TestMetadata("privateFromInAnonymousObject.kt")
public void testPrivateFromInAnonymousObject() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/privateFromInAnonymousObject.kt");
}
@Test
@TestMetadata("protectedInternal.kt")
public void testProtectedInternal() throws Exception {