Fix StackValue.coerce void to Object

We can only put Unit.VALUE on stack if we're requested an instance of Object or Unit. In other cases (arbitrary objects / arrays) we put null instead
2013-04-22 12:13:58 +04:00
parent 36ddfaa24b
commit ace7bd9bc8
4 changed files with 46 additions and 1 deletions
@@ -230,9 +230,12 @@ public abstract class StackValue {
            pop(fromType, v);
        }
        else if (fromType.getSort() == Type.VOID) {
-            if (toType.getSort() == Type.OBJECT) {
+            if (toType.equals(JET_UNIT_TYPE) || toType.equals(OBJECT_TYPE)) {
                putUnitInstance(v);
            }
+            else if (toType.getSort() == Type.OBJECT || toType.getSort() == Type.ARRAY) {
+                v.aconst(null);
+            }
            else {
                pushDefaultPrimitiveValueOnStack(toType, v);
            }