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

[FIR] Keep bare type for type alias case

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-09-01 15:52:04 +03:00
parent 3a5d0ab427
commit db2e3f219f
3 changed files with 4 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/TypeExpansionUtils.kt
+3
View File
@@ -71,6 +71,9 @@ private fun mapTypeAliasArguments(
abbreviatedType: ConeClassLikeType, abbreviatedType: ConeClassLikeType,
resultingType: ConeClassLikeType, resultingType: ConeClassLikeType,
): ConeKotlinType { ): ConeKotlinType {
if (typeAlias.typeParameters.isNotEmpty() && abbreviatedType.typeArguments.isEmpty()) {
return resultingType.lookupTag.constructClassType(emptyArray(), resultingType.isNullable)
}
val typeAliasMap = typeAlias.typeParameters.map { it.symbol }.zip(abbreviatedType.typeArguments).toMap() val typeAliasMap = typeAlias.typeParameters.map { it.symbol }.zip(abbreviatedType.typeArguments).toMap()
val substitutor = object : AbstractConeSubstitutor() { val substitutor = object : AbstractConeSubstitutor() {
compiler/testData/codegen/box/super/basicmethodSuperClass.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// KJS_WITH_FULL_RUNTIME // KJS_WITH_FULL_RUNTIME
// IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: NATIVE
compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.fir.kt
Vendored
+1 -1
View File
@@ -3,5 +3,5 @@ open class Ref<T>(var x: T)
typealias R<T> = Ref<T> typealias R<T> = Ref<T>
// Type inference SHOULD NOT work for type alias constructor in supertypes list // Type inference SHOULD NOT work for type alias constructor in supertypes list
class Test1 : <!INAPPLICABLE_CANDIDATE!>R<!>(0) class Test1 : R(0)
class Test2 : R<Int>(0) class Test2 : R<Int>(0)