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

Eval4j: fix coerce for arrays in return

Browse Source 
#KT-5554 Fixed
This commit is contained in:
Natalia Ukhorskaya
2014-09-11 13:09:13 +04:00
parent 4667190b8c
commit e0469de5be
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt
+1 -1
View File
@@ -175,7 +175,7 @@ public fun interpreterLoop(
IRETURN, LRETURN, FRETURN, DRETURN, ARETURN -> { IRETURN, LRETURN, FRETURN, DRETURN, ARETURN -> {
val value = frame.getStackTop() val value = frame.getStackTop()
val expectedType = Type.getReturnType(m.desc) val expectedType = Type.getReturnType(m.desc)
if (expectedType.getSort() == Type.OBJECT) { if (expectedType.getSort() == Type.OBJECT || expectedType.getSort() == Type.ARRAY) {
val coerced = if (value != NULL_VALUE && value.asmType != expectedType) val coerced = if (value != NULL_VALUE && value.asmType != expectedType)
ObjectValue(value.obj(), expectedType) ObjectValue(value.obj(), expectedType)
else value else value