Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various issues around Resolver.getJavaWildcard #2304

Merged
merged 6 commits into from
Jan 27, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
KSP2: fix/implement most precise covariant check.
Some out variance was incorrectly optimized away.
ting-yuan committed Jan 25, 2025

Verified

This commit was signed with the committer’s verified signature. The key has expired.
Czaki Grzegorz Bokota
commit b0381509ecaafd174df1fa7e55f5c02e181afc42
Original file line number Diff line number Diff line change
@@ -42,7 +42,6 @@ import org.jetbrains.kotlin.analysis.api.fir.evaluate.FirAnnotationValueConverte
import org.jetbrains.kotlin.analysis.api.fir.symbols.KaFirSymbol
import org.jetbrains.kotlin.analysis.api.fir.symbols.KaFirValueParameterSymbol
import org.jetbrains.kotlin.analysis.api.fir.types.KaFirFunctionType
import org.jetbrains.kotlin.analysis.api.fir.types.KaFirType
import org.jetbrains.kotlin.analysis.api.impl.base.types.KaBaseStarTypeProjection
import org.jetbrains.kotlin.analysis.api.impl.base.types.KaBaseTypeArgumentWithVariance
import org.jetbrains.kotlin.analysis.api.platform.lifetime.KotlinAlwaysAccessibleLifetimeToken
@@ -723,12 +722,11 @@ internal fun getVarianceForWildcard(
}
if (projectionKind == Variance.INVARIANT || projectionKind == parameterVariance) {
if (mode.skipDeclarationSiteWildcardsIfPossible && projection !is KaStarTypeProjection) {
val coneType = (projection.type as KaFirType).coneType
// TODO: fix most precise covariant argument case.
if (parameterVariance == Variance.OUT_VARIANCE) {
val type = projection.type ?: return parameterVariance
if (parameterVariance == Variance.OUT_VARIANCE && type.isMostPreciseCovariantArgument()) {
return Variance.INVARIANT
}
if (parameterVariance == Variance.IN_VARIANCE && coneType.isAny) {
if (parameterVariance == Variance.IN_VARIANCE && type.isMostPreciseContravariantArgument()) {
return Variance.INVARIANT
}
}
@@ -737,6 +735,41 @@ internal fun getVarianceForWildcard(
return Variance.OUT_VARIANCE
}

internal fun KaType.isMostPreciseContravariantArgument(): Boolean = analyze { isAnyType }

internal fun KaType.isMostPreciseCovariantArgument() = !canHaveSubtypesIgnoreNullability()

@OptIn(KaExperimentalApi::class)
private fun KaType.canHaveSubtypesIgnoreNullability(): Boolean =
analyze {
val type = fullyExpandedType
val symbol = expandedSymbol ?: return@analyze true
if (symbol.classKind == KaClassKind.ENUM_CLASS || symbol.isExpect) {
return@analyze true
}
if (symbol.modality != KaSymbolModality.FINAL) {
return@analyze true
}

symbol.typeParameters.forEachIndexed { idx, param ->
val projection = type.typeArguments().get(idx)

if (projection !is KaTypeArgumentWithVariance) {
return@analyze true
}

val type = projection.type
val effectiveVariance = getEffectiveVariance(param.variance, projection.variance)
if (effectiveVariance == Variance.OUT_VARIANCE && !type.isMostPreciseCovariantArgument()) {
return@analyze true
}
if (effectiveVariance == Variance.IN_VARIANCE && !type.isMostPreciseContravariantArgument()) {
return@analyze true
}
}
false
}

@OptIn(KaExperimentalApi::class)
internal fun KaType.toWildcard(mode: TypeMappingMode): KaType {
val args = this.typeArguments()
2 changes: 1 addition & 1 deletion kotlin-analysis-api/testData/javaWildcards2.kt
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@
// enumList : List<MyEnum>
// jvmWildcard : List<out String>
// suppressJvmWildcard : List<Number>
// <init> : VarianceSubjectSuppressed<Any?>
// <init> : VarianceSubjectSuppressed<out Any?>
// R : Any?
// END