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

[FIR] Make type parameters inaccessible for non-inner nested types

Browse Source 
#KT-57209
This commit is contained in:
Kirill Rakhman
2023-03-14 17:20:35 +01:00
committed by Space Team
parent c39ab956a0
commit 1f0d56e157
24 changed files with 227 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.fir.txt
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ FILE: typeParameterVsNested.kt
public final class Some : R|test/My.T| {
public constructor(): R|test/My.Some| {
super<R|T|>()
super<R|test/My.T|>()
}
}
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -12540,6 +12540,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/generics/localClassTypeRefWithTypeParameterFromFunction.kt");
}
@Test
@TestMetadata("outerTypeParametersInNestedClasses.kt")
public void testOuterTypeParametersInNestedClasses() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/outerTypeParametersInNestedClasses.kt");
}
@Test
@TestMetadata("Projections.kt")
public void testProjections() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -12546,6 +12546,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/generics/localClassTypeRefWithTypeParameterFromFunction.kt");
}
@Test
@TestMetadata("outerTypeParametersInNestedClasses.kt")
public void testOuterTypeParametersInNestedClasses() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/outerTypeParametersInNestedClasses.kt");
}
@Test
@TestMetadata("Projections.kt")
public void testProjections() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirPropertyAccessorsTypesChecker.kt
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.declarations.utils.isAbstract
import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.types.ConeErrorType
import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.hasError
import org.jetbrains.kotlin.fir.types.isUnit
object FirPropertyAccessorsTypesChecker : FirPropertyChecker() {
@@ -99,7 +100,7 @@ object FirPropertyAccessorsTypesChecker : FirPropertyChecker() {
return
}
if (valueSetterType != propertyType) {
if (valueSetterType != propertyType && !valueSetterType.hasError()) {
reporter.reportOn(valueSetterTypeSource, FirErrors.WRONG_SETTER_PARAMETER_TYPE, propertyType, valueSetterType, context)
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirWhenConditionChecker.kt
+4 -4
View File
@@ -6,16 +6,15 @@
package org.jetbrains.kotlin.fir.analysis.checkers.expression
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.analysis.checkers.checkCondition
import org.jetbrains.kotlin.fir.analysis.checkers.classKind
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition
import org.jetbrains.kotlin.fir.references.toResolvedCallableSymbol
import org.jetbrains.kotlin.fir.expressions.unwrapSmartcastExpression
import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol
import org.jetbrains.kotlin.fir.types.ConeKotlinType
import org.jetbrains.kotlin.fir.types.coneType
@@ -58,7 +57,8 @@ object FirWhenConditionChecker : FirWhenExpressionChecker() {
}
}
is FirTypeOperatorCall -> {
if (!checkedTypes.add(condition.conversionTypeRef.coneType to condition.operation)) {
val coneType = condition.conversionTypeRef.coneType
if (!checkedTypes.add(coneType to condition.operation)) {
reporter.reportOn(condition.conversionTypeRef.source, FirErrors.DUPLICATE_LABEL_IN_WHEN, context)
}
}
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
+5
View File
@@ -131,3 +131,8 @@ fun ConeKotlinType.renderReadableWithFqNames(): String {
return builder.toString()
}
fun ConeKotlinType.hasError(): Boolean = when (this) {
is ConeErrorType -> true
is ConeFlexibleType -> lowerBound.hasError() || upperBound.hasError()
else -> typeArguments.any { it is ConeKotlinType && it.hasError() }
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
+68 -33
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.fir.resolve.transformers
import kotlinx.collections.immutable.toImmutableList
import kotlinx.collections.immutable.*
import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.fir.FirSession
@@ -13,6 +13,8 @@ import org.jetbrains.kotlin.fir.correspondingProperty
import org.jetbrains.kotlin.fir.copyWithNewSourceKind
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.utils.isFromVararg
import org.jetbrains.kotlin.fir.declarations.utils.isInner
import org.jetbrains.kotlin.fir.declarations.utils.isLocal
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguouslyResolvedAnnotationFromPlugin
@@ -62,8 +64,16 @@ open class FirTypeResolveTransformer(
initialCurrentFile: FirFile? = null,
private val classDeclarationsStack: ArrayDeque<FirClass> = ArrayDeque()
) : FirAbstractTreeTransformer<Any?>(FirResolvePhase.TYPES) {
private val scopes = mutableListOf<FirScope>()
private val towerScope = scopes.asReversed()
/**
* All current scopes sorted from outermost to innermost.
*/
private var scopes = initialScopes.asReversed().toPersistentList()
/**
* Scopes that are accessible statically, i.e. [scopes] minus type parameter scopes.
*/
private var staticScopes = scopes
private var currentDeclaration: FirDeclaration? = null
private inline fun <T> withDeclaration(declaration: FirDeclaration, crossinline action: () -> T): T {
@@ -76,10 +86,6 @@ open class FirTypeResolveTransformer(
}
}
init {
scopes.addAll(initialScopes.asReversed())
}
private val typeResolverTransformer: FirSpecificTypeResolverTransformer = FirSpecificTypeResolverTransformer(session)
private var currentFile: FirFile? = initialCurrentFile
@@ -87,7 +93,7 @@ open class FirTypeResolveTransformer(
checkSessionConsistency(file)
currentFile = file
return withScopeCleanup {
scopes.addAll(createImportingScopes(file, session, scopeSession))
addScopes(createImportingScopes(file, session, scopeSession))
super.transformFile(file, data)
}
}
@@ -252,9 +258,18 @@ open class FirTypeResolveTransformer(
override fun transformTypeRef(typeRef: FirTypeRef, data: Any?): FirResolvedTypeRef {
return typeResolverTransformer.withFile(currentFile) {
val scopes = scopes
// optimized implementation of reversed Iterable on top of PersistentList
val reversedScopes = object : Iterable<FirScope> {
override fun iterator() = object : Iterator<FirScope> {
private val iter = scopes.listIterator(scopes.size)
override fun hasNext() = iter.hasPrevious()
override fun next() = iter.previous()
}
}
typeRef.transform(
typeResolverTransformer,
ScopeClassDeclaration(towerScope, classDeclarationsStack, containerDeclaration = currentDeclaration)
ScopeClassDeclaration(reversedScopes, classDeclarationsStack, containerDeclaration = currentDeclaration)
)
}
}
@@ -322,13 +337,14 @@ open class FirTypeResolveTransformer(
}
private inline fun <T> withScopeCleanup(crossinline l: () -> T): T {
val sizeBefore = scopes.size
val scopesBefore = scopes
val staticScopesBefore = staticScopes
val result = l()
val size = scopes.size
assert(size >= sizeBefore)
repeat(size - sizeBefore) {
scopes.removeAt(scopes.lastIndex)
}
scopes = scopesBefore
staticScopes = staticScopesBefore
return result
}
@@ -337,21 +353,25 @@ open class FirTypeResolveTransformer(
data: Any?
): FirStatement {
withScopeCleanup {
firClass.transformAnnotations(this, null)
if (firClass is FirRegularClass) {
firClass.addTypeParametersScope()
}
// ConstructedTypeRef should be resolved only with type parameters, but not with nested classes and classes from supertypes
for (constructor in firClass.declarations.filterIsInstance<FirConstructor>()) {
constructor.delegatedConstructor?.let(this::resolveConstructedTypeRefForDelegatedConstructorCall)
}
}
return withScopeCleanup {
// Remove type parameter scopes for classes that are neither inner nor local
if (!firClass.isInner && !firClass.isLocal) {
this.scopes = staticScopes
}
withScopeCleanup {
firClass.transformAnnotations(this, null)
if (firClass is FirRegularClass) {
firClass.addTypeParametersScope()
}
// ConstructedTypeRef should be resolved only with type parameters, but not with nested classes and classes from supertypes
for (constructor in firClass.declarations.filterIsInstance<FirConstructor>()) {
constructor.delegatedConstructor?.let(this::resolveConstructedTypeRefForDelegatedConstructorCall)
}
}
// ? Is it Ok to use original file session here ?
val superTypes = lookupSuperTypes(
firClass,
@@ -360,19 +380,26 @@ open class FirTypeResolveTransformer(
substituteTypes = true,
useSiteSession = session
).asReversed()
val scopesToAdd = mutableListOf<FirScope>()
for (superType in superTypes) {
superType.lookupTag.getNestedClassifierScope(session, scopeSession)?.let { nestedClassifierScope ->
val scope = nestedClassifierScope.wrapNestedClassifierScopeWithSubstitutionForSuperType(superType, session)
scopes.add(scope)
scopesToAdd.add(scope)
}
}
session.nestedClassifierScope(firClass)?.let(scopes::add)
session.nestedClassifierScope(firClass)?.let(scopesToAdd::add)
if (firClass is FirRegularClass) {
val companionObject = firClass.companionObjectSymbol?.fir
if (companionObject != null) {
session.nestedClassifierScope(companionObject)?.let(scopes::add)
session.nestedClassifierScope(companionObject)?.let(scopesToAdd::add)
}
addScopes(scopesToAdd)
firClass.addTypeParametersScope()
} else {
addScopes(scopesToAdd)
}
// Note that annotations are still visited here
@@ -393,10 +420,18 @@ open class FirTypeResolveTransformer(
private fun FirMemberDeclaration.addTypeParametersScope() {
if (typeParameters.isNotEmpty()) {
scopes.add(FirMemberTypeParameterScope(this))
scopes = scopes.add(FirMemberTypeParameterScope(this))
}
}
private fun addScopes(list: List<FirScope>) {
// small optimization to skip unnecessary allocations
val scopesAreTheSame = scopes === staticScopes
scopes = scopes.addAll(list)
staticScopes = if (scopesAreTheSame) scopes else staticScopes.addAll(list)
}
/**
* In a scenario like
*
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/ScopeClassDeclaration.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.scopes.FirScope
data class ScopeClassDeclaration(
val scopes: List<FirScope>,
val scopes: Iterable<FirScope>,
val containingDeclarations: List<FirDeclaration>,
val topContainer: FirDeclaration? = null,
val containerDeclaration: FirDeclaration? = null,