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

FIR: Preserve K1 behavior for synthetic properties on raw type

Browse Source 
^KT-54502 Fixed
This commit is contained in:
Denis.Zharkov
2022-10-20 13:05:25 +02:00
committed by Space Team
parent 7b15b28ee2
commit c0e0900344
7 changed files with 88 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
+16
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.fir.types.builder.buildErrorTypeRef
import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
import org.jetbrains.kotlin.fir.types.lowerBoundIfFlexible
import org.jetbrains.kotlin.resolve.calls.NewCommonSuperTypeCalculator
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.model.*
@@ -850,3 +851,18 @@ private fun ConeKotlinType.eraseAsUpperBound(
else -> error("unexpected Java type parameter upper bound kind: $this")
}
fun ConeKotlinType.isRaw(): Boolean = lowerBoundIfFlexible().attributes.contains(CompilerConeAttributes.RawType)
fun ConeKotlinType.convertToNonRawVersion(): ConeKotlinType {
if (!isRaw()) return this
if (this is ConeFlexibleType) {
return ConeFlexibleType(
lowerBound.withAttributes(this.attributes.remove(CompilerConeAttributes.RawType)),
upperBound,
)
}
return withAttributes(attributes.remove(CompilerConeAttributes.RawType))
}