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

[FIR] Include anonymous objects in containingDeclarations in FirDeclarationsResolveTransformer.kt

Browse Source 
K1 and K2 still differ because of KT-58203

#KT-63434
This commit is contained in:
Evgeniy.Zhelenskiy
2024-01-26 00:29:56 +01:00
committed by Space Team
parent eb23984182
commit 55adeba011
10 changed files with 129 additions and 23 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/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -40552,6 +40552,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/visibility/kt56283.kt");
}
@Test
@TestMetadata("kt63434.kt")
public void testKt63434() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/kt63434.kt");
}
@Test
@TestMetadata("lackOfInvisibleSetterOfJavaClassInSamePackage.kt")
public void testLackOfInvisibleSetterOfJavaClassInSamePackage() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+6
View File
@@ -40552,6 +40552,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/visibility/kt56283.kt");
}
@Test
@TestMetadata("kt63434.kt")
public void testKt63434() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/kt63434.kt");
}
@Test
@TestMetadata("lackOfInvisibleSetterOfJavaClassInSamePackage.kt")
public void testLackOfInvisibleSetterOfJavaClassInSamePackage() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -38220,6 +38220,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/visibility/kt56283.kt");
}
@Test
@TestMetadata("kt63434.kt")
public void testKt63434() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/kt63434.kt");
}
@Test
@TestMetadata("lackOfInvisibleSetterOfJavaClassInSamePackage.kt")
public void testLackOfInvisibleSetterOfJavaClassInSamePackage() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -38346,6 +38346,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/visibility/kt56283.kt");
}
@Test
@TestMetadata("kt63434.kt")
public void testKt63434() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/kt63434.kt");
}
@Test
@TestMetadata("lackOfInvisibleSetterOfJavaClassInSamePackage.kt")
public void testLackOfInvisibleSetterOfJavaClassInSamePackage() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt
+9 -9
View File
@@ -79,7 +79,7 @@ class BodyResolveContext(
val whenSubjectImportingScopes: ArrayDeque<FirWhenSubjectImportingScope?> = ArrayDeque()
@set:PrivateForInline
var containingClass: FirRegularClass? = null
var containingRegularClass: FirRegularClass? = null
val containerIfAny: FirDeclaration?
get() = containers.lastOrNull()
@@ -107,7 +107,7 @@ class BodyResolveContext(
val anonymousFunctionsAnalyzedInDependentContext: MutableSet<FirFunctionSymbol<*>> = mutableSetOf()
var containingClassDeclarations: ArrayDeque<FirRegularClass> = ArrayDeque()
var containingClassDeclarations: ArrayDeque<FirClass> = ArrayDeque()
@OptIn(PrivateForInline::class)
inline fun <T> withTowerDataContexts(newContexts: FirRegularTowerDataContexts, f: () -> T): T {
@@ -140,19 +140,19 @@ class BodyResolveContext(
}
@PrivateForInline
private inline fun <T> withContainerClass(declaration: FirRegularClass, f: () -> T): T {
val oldContainingClass = containingClass
private inline fun <T> withContainerRegularClass(declaration: FirRegularClass, f: () -> T): T {
val oldContainingClass = containingRegularClass
containers.add(declaration)
containingClass = declaration
containingRegularClass = declaration
return try {
f()
} finally {
containers.removeLast()
containingClass = oldContainingClass
containingRegularClass = oldContainingClass
}
}
inline fun <T> withContainingClass(declaration: FirRegularClass, f: () -> T): T {
inline fun <T> withContainingClass(declaration: FirClass, f: () -> T): T {
containingClassDeclarations.add(declaration)
return try {
f()
@@ -368,7 +368,7 @@ class BodyResolveContext(
specialTowerDataContexts.putAll(this@BodyResolveContext.specialTowerDataContexts)
containers = this@BodyResolveContext.containers
containingClassDeclarations = ArrayDeque(this@BodyResolveContext.containingClassDeclarations)
containingClass = this@BodyResolveContext.containingClass
containingRegularClass = this@BodyResolveContext.containingRegularClass
replaceTowerDataContext(this@BodyResolveContext.towerDataContext)
anonymousFunctionsAnalyzedInDependentContext.addAll(this@BodyResolveContext.anonymousFunctionsAnalyzedInDependentContext)
// Looks like we should copy this session only for builder inference to be able
@@ -417,7 +417,7 @@ class BodyResolveContext(
}
withScopesForClass(regularClass, holder) {
withContainerClass(regularClass, f)
withContainerRegularClass(regularClass, f)
}
}
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+16 -14
View File
@@ -292,7 +292,7 @@ open class FirDeclarationsResolveTransformer(
if (property.returnTypeRef is FirResolvedTypeRef) {
val typeArguments = (type.type as ConeClassLikeType).typeArguments
val extensionType = property.receiverParameter?.typeRef?.coneType
val dispatchType = context.containingClass?.let { containingClass ->
val dispatchType = context.containingRegularClass?.let { containingClass ->
containingClass.symbol.constructStarProjectedType(containingClass.typeParameters.size)
}
propertyReferenceAccess.replaceConeTypeOrNull(
@@ -789,21 +789,23 @@ open class FirDeclarationsResolveTransformer(
anonymousObject: FirAnonymousObject,
data: ResolutionMode
): FirAnonymousObject = whileAnalysing(session, anonymousObject) {
if (anonymousObject !in context.targetedLocalClasses) {
return anonymousObject.runAllPhasesForLocalClass(components, data, transformer.firResolveContextCollector)
}
context.withContainingClass(anonymousObject) {
if (anonymousObject !in context.targetedLocalClasses) {
return anonymousObject.runAllPhasesForLocalClass(components, data, transformer.firResolveContextCollector)
}
require(anonymousObject.controlFlowGraphReference == null)
val buildGraph = !implicitTypeOnly
dataFlowAnalyzer.enterClass(anonymousObject, buildGraph)
val result = context.withAnonymousObject(anonymousObject, components) {
transformDeclarationContent(anonymousObject, data) as FirAnonymousObject
require(anonymousObject.controlFlowGraphReference == null)
val buildGraph = !implicitTypeOnly
dataFlowAnalyzer.enterClass(anonymousObject, buildGraph)
val result = context.withAnonymousObject(anonymousObject, components) {
transformDeclarationContent(anonymousObject, data) as FirAnonymousObject
}
val graph = dataFlowAnalyzer.exitClass()
if (graph != null) {
result.replaceControlFlowGraphReference(FirControlFlowGraphReferenceImpl(graph))
}
result
}
val graph = dataFlowAnalyzer.exitClass()
if (graph != null) {
result.replaceControlFlowGraphReference(FirControlFlowGraphReferenceImpl(graph))
}
return result
}
override fun transformSimpleFunction(
compiler/testData/diagnostics/tests/visibility/kt63434.fir.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// SKIP_TXT
// FIR_DUMP
abstract class InlineCompletionSessionManager {
protected class Proto {
class Some
}
}
fun checkCannotAccess() {
object : InlineCompletionSessionManager() {
fun chch() {
val b: Proto = Proto()
if (b is Proto.Some) return
}
}
}
compiler/testData/diagnostics/tests/visibility/kt63434.fir.txt
Vendored
+40
View File
@@ -0,0 +1,40 @@
FILE: kt63434.fir.kt
public abstract class InlineCompletionSessionManager : R|kotlin/Any| {
public constructor(): R|InlineCompletionSessionManager| {
super<R|kotlin/Any|>()
}
protected final class Proto : R|kotlin/Any| {
public constructor(): R|InlineCompletionSessionManager.Proto| {
super<R|kotlin/Any|>()
}
public final class Some : R|kotlin/Any| {
public constructor(): R|InlineCompletionSessionManager.Proto.Some| {
super<R|kotlin/Any|>()
}
}
}
}
public final fun checkCannotAccess(): R|kotlin/Unit| {
object : R|InlineCompletionSessionManager| {
private constructor(): R|<anonymous>| {
super<R|InlineCompletionSessionManager|>()
}
public final fun chch(): R|kotlin/Unit| {
lval b: R|InlineCompletionSessionManager.Proto| = R|/InlineCompletionSessionManager.Proto.Proto|()
when () {
(R|<local>/b| is R|InlineCompletionSessionManager.Proto.Some|) -> {
^chch Unit
}
}
}
}
}
compiler/testData/diagnostics/tests/visibility/kt63434.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// SKIP_TXT
// FIR_DUMP
abstract class InlineCompletionSessionManager {
protected class Proto {
class Some
}
}
fun checkCannotAccess() {
object : InlineCompletionSessionManager() {
fun chch() {
val b: Proto = Proto()
if (b is <!INCOMPATIBLE_TYPES!>Proto.Some<!>) return
}
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -40552,6 +40552,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/visibility/kt56283.kt");
}
@Test
@TestMetadata("kt63434.kt")
public void testKt63434() throws Exception {
runTest("compiler/testData/diagnostics/tests/visibility/kt63434.kt");
}
@Test
@TestMetadata("lackOfInvisibleSetterOfJavaClassInSamePackage.kt")
public void testLackOfInvisibleSetterOfJavaClassInSamePackage() throws Exception {