KT-950 wrong call to array-like setter with non-void return type

2012-01-10 15:36:33 +02:00
parent 8a9a591370
commit 5633f71edc
3 changed files with 24 additions and 2 deletions
@@ -531,8 +531,17 @@ public abstract class StackValue {
            if (setter == null) {
                throw new UnsupportedOperationException("no setter specified");
            }
-            if(setter instanceof CallableMethod)
-                ((CallableMethod)setter).invoke(v);
+            if(setter instanceof CallableMethod) {
+                CallableMethod method = (CallableMethod) setter;
+                method.invoke(v);
+                Type returnType = method.getSignature().getAsmMethod().getReturnType();
+                if(returnType != Type.VOID_TYPE) {
+                    if(returnType.getSize() == 2)
+                        v.pop2();
+                    else
+                        v.pop();
+                }
+            }
            else
                ((IntrinsicMethod)setter).generate(codegen, v, null, null, null, null);
        }