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

FIR type enhancements: more accurate * handling

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-03-07 14:18:56 +03:00
parent c708171add
commit de14dd1b9f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/EnhancementSignatureParts.kt
+11 -11
View File
@@ -84,8 +84,8 @@ internal class EnhancementSignatureParts(
): List<TypeAndDefaultQualifiers> { ): List<TypeAndDefaultQualifiers> {
val list = ArrayList<TypeAndDefaultQualifiers>(1) val list = ArrayList<TypeAndDefaultQualifiers>(1)
fun add(type: FirTypeRef) { fun add(type: FirTypeRef?) {
val c = context.copyWithNewDefaultTypeQualifiers(typeQualifierResolver, jsr305State, type.annotations) val c = context.copyWithNewDefaultTypeQualifiers(typeQualifierResolver, jsr305State, type?.annotations.orEmpty())
list.add( list.add(
TypeAndDefaultQualifiers( TypeAndDefaultQualifiers(
@@ -98,15 +98,15 @@ internal class EnhancementSignatureParts(
if (type is FirJavaTypeRef) { if (type is FirJavaTypeRef) {
for (arg in type.type.typeArguments()) { for (arg in type.type.typeArguments()) {
if (arg is JavaWildcardType || arg == null) { if (arg is JavaWildcardType || arg == null) {
// TODO: wildcards / raw types add(null)
} else { } else {
add(arg.toFirJavaTypeRef(context.session)) add(arg.toFirJavaTypeRef(context.session))
} }
} }
} else { } else if (type != null) {
for (arg in type.typeArguments()) { for (arg in type.typeArguments()) {
if (arg is FirStarProjection) { if (arg is FirStarProjection) {
// TODO: wildcards add(null)
} else if (arg is FirTypeProjectionWithVariance) { } else if (arg is FirTypeProjectionWithVariance) {
add(arg.typeRef) add(arg.typeRef)
} }
@@ -166,16 +166,16 @@ internal class EnhancementSignatureParts(
} }
} }
private fun FirTypeRef.extractQualifiersFromAnnotations( private fun FirTypeRef?.extractQualifiersFromAnnotations(
isHeadTypeConstructor: Boolean, isHeadTypeConstructor: Boolean,
defaultQualifiersForType: JavaTypeQualifiers?, defaultQualifiersForType: JavaTypeQualifiers?,
jsr305State: Jsr305State jsr305State: Jsr305State
): JavaTypeQualifiers { ): JavaTypeQualifiers {
val composedAnnotation = val composedAnnotation =
if (isHeadTypeConstructor && typeContainer != null) if (isHeadTypeConstructor && typeContainer != null)
composeAnnotations(typeContainer.annotations, annotations) composeAnnotations(typeContainer.annotations, this?.annotations.orEmpty())
else else
annotations this?.annotations.orEmpty()
fun <T : Any> List<FqName>.ifPresent(qualifier: T) = fun <T : Any> List<FqName>.ifPresent(qualifier: T) =
if (any { fqName -> if (any { fqName ->
@@ -215,7 +215,7 @@ internal class EnhancementSignatureParts(
) )
} }
private fun FirTypeRef.computeQualifiersForOverride( private fun FirTypeRef?.computeQualifiersForOverride(
session: FirSession, session: FirSession,
fromSupertypes: Collection<FirTypeRef>, fromSupertypes: Collection<FirTypeRef>,
defaultQualifiersForType: JavaTypeQualifiers?, defaultQualifiersForType: JavaTypeQualifiers?,
@@ -279,11 +279,11 @@ internal class EnhancementSignatureParts(
val isHeadTypeConstructor = index == 0 val isHeadTypeConstructor = index == 0
assert(isHeadTypeConstructor || !onlyHeadTypeConstructor) { "Only head type constructors should be computed" } assert(isHeadTypeConstructor || !onlyHeadTypeConstructor) { "Only head type constructors should be computed" }
val (qualifiers, defaultQualifiers) = indexedThisType[index] val (type, defaultQualifiers) = indexedThisType[index]
val verticalSlice = indexedFromSupertypes.mapNotNull { it.getOrNull(index)?.type } val verticalSlice = indexedFromSupertypes.mapNotNull { it.getOrNull(index)?.type }
// Only the head type constructor is safely co-variant // Only the head type constructor is safely co-variant
qualifiers.computeQualifiersForOverride(session, verticalSlice, defaultQualifiers, isHeadTypeConstructor, jsr305State) type.computeQualifiersForOverride(session, verticalSlice, defaultQualifiers, isHeadTypeConstructor, jsr305State)
} }
return IndexedJavaTypeQualifiers(computedResult) return IndexedJavaTypeQualifiers(computedResult)
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/javaTypeUtils.kt
+1 -1
View File
@@ -222,7 +222,7 @@ private fun ConeClassifierSymbol.enhanceMutability(
internal data class TypeAndDefaultQualifiers( internal data class TypeAndDefaultQualifiers(
val type: FirTypeRef, val type: FirTypeRef?, // null denotes '*' here
val defaultQualifiers: JavaTypeQualifiers? val defaultQualifiers: JavaTypeQualifiers?
) )