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

FIR: fix private-to-this corner case with outer class type parameter

Browse Source 
Related to KT-49875
This commit is contained in:
Mikhail Glukhikh
2022-07-13 16:43:11 +02:00
committed by Space
parent d16e5e5e50
commit 623f832bfd
5 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt
+5 -1
View File
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
import org.jetbrains.kotlin.fir.declarations.impl.FirOuterClassTypeParameterRef
import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl
import org.jetbrains.kotlin.fir.declarations.utils.effectiveVisibility
import org.jetbrains.kotlin.fir.declarations.utils.isExpect
@@ -17,6 +18,7 @@ import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.extensions.*
import org.jetbrains.kotlin.fir.render
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.fir.scopes.ProcessorAction
import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope
import org.jetbrains.kotlin.fir.symbols.ensureResolved
@@ -321,7 +323,9 @@ class FirStatusResolver(
return !type.lookupTag.typeParameterSymbol.fir.variance.allowsPosition(requiredVariance)
}
if (type is ConeClassLikeType) {
for (argument in type.typeArguments) {
val classLike = type.lookupTag.toSymbol(session)?.fir
for ((index, argument) in type.typeArguments.withIndex()) {
if (classLike?.typeParameters?.getOrNull(index) is FirOuterClassTypeParameterRef) continue
val (argType, requiredVarianceForArgument) = when (argument) {
is ConeKotlinTypeProjectionOut -> argument.type to requiredVariance
is ConeKotlinTypeProjectionIn -> argument.type to requiredVariance.opposite()