diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt index cc91097ac05..948cfce15a8 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt @@ -139,7 +139,7 @@ internal class KClassValue(value: Value) : ConstantValue(valu val klass = session.firSymbolProvider.getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass ?: return null var type: ConeKotlinType = klass.defaultType().replaceArgumentsWithStarProjections() repeat(arrayDimensions) { - type = type.createArrayOf() + type = type.createArrayType() } return type } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt index 2f5568d319e..566432966d9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt @@ -35,7 +35,6 @@ import org.jetbrains.kotlin.fir.types.builder.buildStarProjection import org.jetbrains.kotlin.fir.types.builder.buildTypeProjectionWithVariance import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl import org.jetbrains.kotlin.fir.visitors.* -import org.jetbrains.kotlin.resolve.calls.NewCommonSuperTypeCalculator import org.jetbrains.kotlin.types.AbstractTypeApproximator import org.jetbrains.kotlin.types.TypeApproximatorConfiguration import org.jetbrains.kotlin.types.Variance @@ -546,7 +545,7 @@ class FirCallCompletionResultsWriterTransformer( arrayOfCall.transformChildren(this, expectedArrayElementType?.toExpectedType()) val arrayElementType = session.inferenceComponents.ctx.commonSuperTypeOrNull(arrayOfCall.arguments.map { it.typeRef.coneType }) ?: session.builtinTypes.nullableAnyType.type - arrayOfCall.resultType = arrayOfCall.typeRef.resolvedTypeFromPrototype(arrayElementType.createArrayOf()) + arrayOfCall.resultType = arrayOfCall.typeRef.resolvedTypeFromPrototype(arrayElementType.createArrayType()) return arrayOfCall.compose() } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt index 4030082da15..4b2dc50d48d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSyntheticCallGenerator.kt @@ -214,7 +214,7 @@ class FirSyntheticCallGenerator( val (typeParameter, returnType) = generateSyntheticSelectTypeParameter() - val argumentType = buildResolvedTypeRef { type = returnType.type.createArrayOf() } + val argumentType = buildResolvedTypeRef { type = returnType.type.createArrayType() } val typeArgument = buildTypeProjectionWithVariance { typeRef = returnType variance = Variance.INVARIANT diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt index 3e77e25c487..5cdd8ca27e9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/TransformUtils.kt @@ -101,7 +101,7 @@ internal fun FirTypedDeclaration.transformTypeToArrayType() { transformReturnTypeRef( StoreType, returnTypeRef.withReplacedConeType( - ConeKotlinTypeProjectionOut(returnType).createArrayOf(), + ConeKotlinTypeProjectionOut(returnType).createArrayType(), FirFakeSourceElementKind.ArrayTypeFromVarargParameter ) ) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt index 63ac3569a2c..499f40ed57b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ArrayUtils.kt @@ -8,10 +8,10 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.fir.symbols.StandardClassIds fun ConeKotlinType.createOutArrayType(nullable: Boolean = false): ConeKotlinType { - return ConeKotlinTypeProjectionOut(this).createArrayOf(nullable) + return ConeKotlinTypeProjectionOut(this).createArrayType(nullable) } -fun ConeTypeProjection.createArrayOf(nullable: Boolean = false): ConeKotlinType { +fun ConeTypeProjection.createArrayType(nullable: Boolean = false): ConeKotlinType { if (this is ConeKotlinTypeProjection) { val type = type.lowerBoundIfFlexible() if (type is ConeClassLikeType && type.nullability != ConeNullability.NULLABLE) {