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

Support javaClass for Void type

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-11-17 16:00:48 +01:00
parent f7968e1b61
commit 0729566458
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JavaClassProperty.kt
+11 -11
View File
@@ -21,13 +21,9 @@ import org.jetbrains.kotlin.backend.jvm.codegen.BlockInfo
import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.AsmUtil
import org.jetbrains.kotlin.codegen.AsmUtil.boxType import org.jetbrains.kotlin.codegen.AsmUtil.boxType
import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive
import org.jetbrains.kotlin.codegen.Callable
import org.jetbrains.kotlin.codegen.ExpressionCodegen
import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.codegen.StackValue
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.jvm.AsmTypes
import org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType
import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
@@ -40,12 +36,16 @@ object JavaClassProperty : IntrinsicMethod() {
override fun invoke(v: InstructionAdapter, codegen: org.jetbrains.kotlin.backend.jvm.codegen.ExpressionCodegen, data: BlockInfo): StackValue { override fun invoke(v: InstructionAdapter, codegen: org.jetbrains.kotlin.backend.jvm.codegen.ExpressionCodegen, data: BlockInfo): StackValue {
val value = codegen.gen(expression.extensionReceiver!!, data) val value = codegen.gen(expression.extensionReceiver!!, data)
val type = value.type val type = value.type
if (isPrimitive(type)) { when {
AsmUtil.pop(v, type) type == Type.VOID_TYPE -> {
v.getstatic(boxType(type).internalName, "TYPE", "Ljava/lang/Class;") StackValue.unit().put(AsmTypes.UNIT_TYPE, v)
} v.invokevirtual("java/lang/Object", "getClass", "()Ljava/lang/Class;", false)
else { }
v.invokevirtual("java/lang/Object", "getClass", "()Ljava/lang/Class;", false) isPrimitive(type) -> {
AsmUtil.pop(v, type)
v.getstatic(boxType(type).internalName, "TYPE", "Ljava/lang/Class;")
}
else -> v.invokevirtual("java/lang/Object", "getClass", "()Ljava/lang/Class;", false)
} }
return with(codegen) { return with(codegen) {