Skip to content

Commit 7a25213

Browse files
strangepleasuresudalov
strangepleasures
authored and
udalov
committed
KT-53465, KT-53677 Get rid of unnecessary checkcasts to array of reified type
(cherry picked from commit a75d5ba)
1 parent 2587f3e commit 7a25213

File tree

17 files changed

+213
-1
lines changed

17 files changed

+213
-1
lines changed

‎compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java

+24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt

+22
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
1919
import org.jetbrains.kotlin.backend.jvm.ir.*
2020
import org.jetbrains.kotlin.backend.jvm.unboxInlineClass
2121
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
22+
import org.jetbrains.kotlin.ir.IrBuiltIns
2223
import org.jetbrains.kotlin.ir.IrElement
2324
import org.jetbrains.kotlin.ir.IrStatement
2425
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
@@ -36,6 +37,9 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
3637
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
3738
import org.jetbrains.kotlin.ir.visitors.acceptVoid
3839
import org.jetbrains.kotlin.name.Name
40+
import org.jetbrains.kotlin.types.Variance
41+
import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext.getArgument
42+
import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext.isTypeVariableType
3943
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
4044
import org.jetbrains.org.objectweb.asm.Handle
4145
import org.jetbrains.org.objectweb.asm.Opcodes
@@ -88,6 +92,8 @@ private class TypeOperatorLowering(private val backendContext: JvmBackendContext
8892
builder.irAs(argument, type)
8993
argument.type.isInlineClassType() && argument.type.isSubtypeOfClass(type.erasedUpperBound.symbol) ->
9094
argument
95+
isCompatibleArrayType(argument.type, type) ->
96+
argument
9197
type.isNullable() || argument.isDefinitelyNotNull() ->
9298
builder.irAs(argument, type)
9399
else -> {
@@ -121,6 +127,22 @@ private class TypeOperatorLowering(private val backendContext: JvmBackendContext
121127
}
122128
}
123129

130+
private fun isCompatibleArrayType(actualType: IrType, expectedType: IrType): Boolean {
131+
var actual = actualType
132+
var expected = expectedType
133+
while ((actual.isArray() || actual.isNullableArray()) && (expected.isArray() || expected.isNullableArray())) {
134+
actual = actual.getArrayElementLowerType()
135+
expected = expected.getArrayElementLowerType()
136+
}
137+
if (actual == actualType || expected == expectedType) return false
138+
return actual.isSubtypeOfClass(expected.erasedUpperBound.symbol)
139+
}
140+
141+
private fun IrType.getArrayElementLowerType(): IrType =
142+
if (isBoxedArray && this is IrSimpleType && (arguments.singleOrNull() as? IrTypeProjection)?.variance == Variance.IN_VARIANCE)
143+
backendContext.irBuiltIns.anyNType
144+
else getArrayElementType(backendContext.irBuiltIns)
145+
124146
// TODO extract null check elimination on IR somewhere?
125147
private fun IrExpression.isDefinitelyNotNull(): Boolean =
126148
when (this) {

‎compiler/testData/codegen/box/casts/arrayDowncastingContravariant.kt

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// TARGET_BACKEND: JVM
2+
3+
inline fun <reified T : CharSequence> f(x: Array<in String>) = x as Array<T>
4+
5+
fun box(): String = try {
6+
f<String>(arrayOf<Any>(42))
7+
"Fail"
8+
} catch (e: Exception) {
9+
"OK"
10+
}

‎compiler/testData/codegen/box/casts/arrayDowncatingInvariant.kt

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// TARGET_BACKEND: JVM
2+
3+
inline fun <reified T : CharSequence> f(x: Array<Any>) = x as Array<T>
4+
5+
fun box(): String = try {
6+
f<String>(arrayOf<Any>(42))
7+
"Fail"
8+
} catch (e: Exception) {
9+
"OK"
10+
}

‎compiler/testData/codegen/box/casts/arrayDownctingCovariant.kt

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// TARGET_BACKEND: JVM
2+
3+
inline fun <reified T : CharSequence> f(x: Array<out Any>) = x as Array<T>
4+
5+
fun box(): String = try {
6+
f<String>(arrayOf<Int>(42))
7+
"Fail"
8+
} catch (e: Exception) {
9+
"OK"
10+
}

‎compiler/testData/codegen/box/casts/kt48927_privateMethodOnDerivedCastToBase.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ abstract class Base {
22
private fun test(): String = "OK"
33

44
fun test(d: Derived): String = (d as Base).test()
5+
6+
fun test(d: Array<out Derived>) = (d as Array<out Base>)[0].test()
57
}
68

79
class Derived : Base()
810

9-
fun box(): String = Derived().test(Derived())
11+
fun box(): String {
12+
Derived().test(arrayOf(Derived()))
13+
return Derived().test(Derived())
14+
}

‎compiler/testData/codegen/box/casts/kt53677.kt

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// WITH_STDLIB
2+
// WITH_COROUTINES
3+
// DONT_TARGET_EXACT_BACKEND: JVM
4+
// DONT_TARGET_EXACT_BACKEND: JS
5+
6+
import kotlin.coroutines.*
7+
8+
public inline fun <reified T> myEmptyArray(): Array<T> = arrayOfNulls<T>(0) as Array<T>
9+
10+
inline fun <reified T> Array<out T>?.myOrEmpty(): Array<out T> = this ?: myEmptyArray<T>()
11+
12+
fun <T> runBlocking(c: suspend () -> T): T {
13+
var res: T? = null
14+
c.startCoroutine(Continuation(EmptyCoroutineContext) {
15+
res = it.getOrThrow()
16+
})
17+
return res!!
18+
}
19+
20+
suspend fun suspendHere(x: String) {}
21+
22+
suspend fun main() {
23+
arrayOf("1").myOrEmpty().forEach { suspendHere(it) }
24+
}
25+
26+
fun box(): String {
27+
runBlocking(::main)
28+
return "OK"
29+
}

‎compiler/testData/codegen/bytecodeText/checkcast/kt53465.kt

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// TARGET_BACKEND: JVM_IR
2+
3+
public inline fun <reified T> myEmptyArray(): Array<T> = arrayOfNulls<T>(0) as Array<T>
4+
5+
inline fun <reified T> Array<out T>?.myOrEmpty(): Array<out T> = this ?: myEmptyArray<T>()
6+
7+
fun foo(a : Array<String>?) = a.myOrEmpty()
8+
9+
val a = arrayOf<Int>(1) as Array<Any>
10+
11+
val b = arrayOf<Int>(1) as Array<Int>
12+
13+
val c = arrayOf(arrayOf<Int>(1)) as Array<Array<Any>?>
14+
15+
// 0 CHECKCAST

‎compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java

+24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/D8Checker.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.android.tools.r8.*;
99
import com.android.tools.r8.origin.PathOrigin;
10+
import com.android.tools.r8.utils.ExceptionDiagnostic;
1011
import kotlin.Pair;
1112
import org.jetbrains.kotlin.backend.common.output.OutputFile;
1213
import org.jetbrains.kotlin.test.KtAssert;

‎compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)