Merge pull request #10228 from igfoo/igfoo/useSimpleType

Kotlin: Refactor useSimpleType to avoid some casts
This commit is contained in:
Ian Lynagh
2022-08-31 11:32:35 +01:00
committed by GitHub

View File

@@ -667,11 +667,15 @@ open class KotlinUsesExtractor(
dimensions++
if (elementType.isPrimitiveArray())
isPrimitiveArray = true
if (((elementType as IrSimpleType).arguments.singleOrNull() as? IrTypeProjection)?.variance == Variance.IN_VARIANCE) {
// Because Java's arrays are covariant, Kotlin will render Array<in X> as Object[], Array<Array<in X>> as Object[][] etc.
componentType = replaceComponentTypeWithAny(s, dimensions - 1)
elementType = pluginContext.irBuiltIns.anyType as IrSimpleType
break
if (elementType is IrSimpleType) {
if ((elementType.arguments.singleOrNull() as? IrTypeProjection)?.variance == Variance.IN_VARIANCE) {
// Because Java's arrays are covariant, Kotlin will render Array<in X> as Object[], Array<Array<in X>> as Object[][] etc.
componentType = replaceComponentTypeWithAny(s, dimensions - 1)
elementType = pluginContext.irBuiltIns.anyType
break
}
} else {
logger.warn("Unexpected element type representation ${elementType.javaClass} for ${s.render()}")
}
elementType = elementType.getArrayElementType(pluginContext.irBuiltIns)
}