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

KT-36810 Implement javaPrimitiveType intrinsic in JVM_IR

Browse Source
This commit is contained in:
Dmitry Petrov
2020-03-17 15:56:39 +03:00
parent 2851fab281
commit ade18d144a
9 changed files with 169 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -12216,6 +12216,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/inlineClasses/javaClassIntrinsicOnInlineClasses.kt");
}
@TestMetadata("javaPrimitiveTypeIC.kt")
public void testJavaPrimitiveTypeIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt");
}
@TestMetadata("jvmFieldInInlineClassCompanion.kt")
public void testJvmFieldInInlineClassCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/jvmFieldInInlineClassCompanion.kt");
@@ -13487,6 +13492,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/intrinsics/javaPrimitiveType.kt");
}
@TestMetadata("javaPrimitiveType_UnitAndNothing.kt")
public void testJavaPrimitiveType_UnitAndNothing() throws Exception {
runTest("compiler/testData/codegen/box/intrinsics/javaPrimitiveType_UnitAndNothing.kt");
}
@TestMetadata("kt10131.kt")
public void testKt10131() throws Exception {
runTest("compiler/testData/codegen/box/intrinsics/kt10131.kt");
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/GetJavaPrimitiveType.kt
+77
View File
@@ -0,0 +1,77 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.backend.jvm.intrinsics
import org.jetbrains.kotlin.backend.jvm.codegen.*
import org.jetbrains.kotlin.codegen.AsmUtil
import org.jetbrains.kotlin.ir.expressions.IrClassReference
import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
import org.jetbrains.kotlin.ir.expressions.IrGetClass
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.isTypeParameter
import org.jetbrains.kotlin.ir.util.render
import org.jetbrains.kotlin.resolve.jvm.AsmTypes
import org.jetbrains.org.objectweb.asm.Type
object GetJavaPrimitiveType : IntrinsicMethod() {
override fun invoke(expression: IrFunctionAccessExpression, codegen: ExpressionCodegen, data: BlockInfo): PromisedValue? {
val receiver = expression.extensionReceiver ?: return null
val argumentType =
when (receiver) {
is IrGetClass -> receiver.argument.type
is IrClassReference -> receiver.classType
else -> return null
}
if (argumentType.isTypeParameter()) return null
val argumentAsmType = codegen.typeMapper.mapTypeAsDeclaration(argumentType)
val isPrimitiveTypeOrWrapper =
argumentType.isPrimitiveType() ||
argumentType.isNullablePrimitiveType() ||
!argumentType.isInlineClassType() && argumentAsmType.isVoidOrPrimitiveWrapper()
return when (receiver) {
is IrGetClass -> {
if (!isPrimitiveTypeOrWrapper) return null
val argumentValue = receiver.argument.accept(codegen, data)
argumentValue.materialize()
AsmUtil.pop(codegen.mv, argumentValue.type)
putPrimitiveType(codegen, argumentAsmType)
with(codegen) { expression.onStack }
}
is IrClassReference -> {
if (!isPrimitiveTypeOrWrapper) {
codegen.mv.aconst(null)
} else {
putPrimitiveType(codegen, argumentAsmType)
}
with(codegen) { expression.onStack }
}
else ->
throw AssertionError("IrGetClass or IrClassReference expected: ${receiver.render()}")
}
}
private fun putPrimitiveType(codegen: ExpressionCodegen, type: Type) {
codegen.mv.getstatic(AsmUtil.boxType(type).internalName, "TYPE", "Ljava/lang/Class;")
}
private fun IrType.isInlineClassType(): Boolean {
return (classOrNull ?: return false).owner.isInline
}
private fun Type.isVoidOrPrimitiveWrapper(): Boolean =
this == AsmTypes.VOID_WRAPPER_TYPE || AsmUtil.unboxPrimitiveTypeOrNull(this) != null
}
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt
+1
View File
@@ -44,6 +44,7 @@ class IrIntrinsicMethods(val irBuiltIns: IrBuiltIns, val symbols: JvmSymbols) {
listOf(
Key(kotlinJvm, FqName("T"), "<get-javaClass>", emptyList()) to JavaClassProperty,
Key(kotlinJvm, KotlinBuiltIns.FQ_NAMES.kClass.toSafe(), "<get-javaObjectType>", emptyList()) to GetJavaObjectType,
Key(kotlinJvm, KotlinBuiltIns.FQ_NAMES.kClass.toSafe(), "<get-javaPrimitiveType>", emptyList()) to GetJavaPrimitiveType,
Key(
kotlinJvm,
KotlinBuiltIns.FQ_NAMES.kClass.toSafe(),
compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt
Vendored
+34
View File
@@ -0,0 +1,34 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
import kotlin.test.*
inline class I(val x: Int)
inline class JLI(val x: java.lang.Integer)
inline class U(val x: Unit?)
inline class N(val x: Nothing?)
val icUnit = U(Unit)
val icNull = N(null)
val anyIcUnit: Any = icUnit
val anyIcNull: Any = icNull
val z = I(42)
val jli = JLI(java.lang.Integer(42))
fun box(): String {
assertEquals(null, icUnit::class.javaPrimitiveType)
assertEquals(null, icNull::class.javaPrimitiveType)
assertEquals(null, anyIcUnit::class.javaPrimitiveType)
assertEquals(null, anyIcNull::class.javaPrimitiveType)
assertEquals(null, z::class.javaPrimitiveType)
assertEquals(null, jli::class.javaPrimitiveType)
assertEquals(null, U::class.javaPrimitiveType)
assertEquals(null, N::class.javaPrimitiveType)
assertEquals(null, I::class.javaPrimitiveType)
assertEquals(null, JLI::class.javaPrimitiveType)
return "OK"
}
compiler/testData/codegen/box/intrinsics/javaPrimitiveType_UnitAndNothing.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
import kotlin.test.*
val pUnit = Unit
val pNUnit: Unit? = Unit
fun box(): String {
assertEquals(null, pUnit::class.javaPrimitiveType)
assertEquals(null, pNUnit!!::class.javaPrimitiveType)
assertEquals(null, Unit::class.javaPrimitiveType)
assertEquals(java.lang.Void.TYPE, Nothing::class.javaPrimitiveType)
return "OK"
}
compiler/testData/codegen/bytecodeText/intrinsics/javaPrimitiveType.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JVM_IR
class A {
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -13361,6 +13361,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inlineClasses/javaClassIntrinsicOnInlineClasses.kt");
}
@TestMetadata("javaPrimitiveTypeIC.kt")
public void testJavaPrimitiveTypeIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt");
}
@TestMetadata("jvmFieldInInlineClassCompanion.kt")
public void testJvmFieldInInlineClassCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/jvmFieldInInlineClassCompanion.kt");
@@ -14632,6 +14637,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/intrinsics/javaPrimitiveType.kt");
}
@TestMetadata("javaPrimitiveType_UnitAndNothing.kt")
public void testJavaPrimitiveType_UnitAndNothing() throws Exception {
runTest("compiler/testData/codegen/box/intrinsics/javaPrimitiveType_UnitAndNothing.kt");
}
@TestMetadata("kt10131.kt")
public void testKt10131() throws Exception {
runTest("compiler/testData/codegen/box/intrinsics/kt10131.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+10
View File
@@ -13366,6 +13366,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inlineClasses/javaClassIntrinsicOnInlineClasses.kt");
}
@TestMetadata("javaPrimitiveTypeIC.kt")
public void testJavaPrimitiveTypeIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt");
}
@TestMetadata("jvmFieldInInlineClassCompanion.kt")
public void testJvmFieldInInlineClassCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/jvmFieldInInlineClassCompanion.kt");
@@ -14632,6 +14637,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/intrinsics/javaPrimitiveType.kt");
}
@TestMetadata("javaPrimitiveType_UnitAndNothing.kt")
public void testJavaPrimitiveType_UnitAndNothing() throws Exception {
runTest("compiler/testData/codegen/box/intrinsics/javaPrimitiveType_UnitAndNothing.kt");
}
@TestMetadata("kt10131.kt")
public void testKt10131() throws Exception {
runTest("compiler/testData/codegen/box/intrinsics/kt10131.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -12216,6 +12216,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inlineClasses/javaClassIntrinsicOnInlineClasses.kt");
}
@TestMetadata("javaPrimitiveTypeIC.kt")
public void testJavaPrimitiveTypeIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt");
}
@TestMetadata("jvmFieldInInlineClassCompanion.kt")
public void testJvmFieldInInlineClassCompanion() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/jvmFieldInInlineClassCompanion.kt");
@@ -13487,6 +13492,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/intrinsics/javaPrimitiveType.kt");
}
@TestMetadata("javaPrimitiveType_UnitAndNothing.kt")
public void testJavaPrimitiveType_UnitAndNothing() throws Exception {
runTest("compiler/testData/codegen/box/intrinsics/javaPrimitiveType_UnitAndNothing.kt");
}
@TestMetadata("kt10131.kt")
public void testKt10131() throws Exception {
runTest("compiler/testData/codegen/box/intrinsics/kt10131.kt");