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

Fix coercion after call

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-11-22 12:37:49 +01:00
parent 4df0a1bb1f
commit 7da847e943
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+7 -2
View File
@@ -275,8 +275,12 @@ class ExpressionCodegen(
if (returnType != null && KotlinBuiltIns.isNothing(returnType)) {
mv.aconst(null)
mv.athrow()
} else if (expression.descriptor !is ConstructorDescriptor) {
val expectedTypeOnStack = returnType?.let { typeMapper.mapType(it) } ?: callable.returnType
StackValue.coerce(callable.returnType, expectedTypeOnStack, mv)
}
return StackValue.onStack(callable.returnType)
return expression.onStack
}
override fun visitInstanceInitializerCall(expression: IrInstanceInitializerCall, data: BlockInfo): StackValue {
@@ -882,7 +886,8 @@ class ExpressionCodegen(
data: BlockInfo
) {
if (receiverExpression !is IrClassReference /* && DescriptorUtils.isObjectQualifier(receiverExpression.descriptor)*/) {
JavaClassProperty.generateImpl(mv, gen(receiverExpression, data))
assert(receiverExpression is IrGetClass)
JavaClassProperty.generateImpl(mv, gen((receiverExpression as IrGetClass).argument, data))
}
else {
// if (TypeUtils.isTypeParameter(type)) {