Extract method

compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java

@@ -532,6 +532,30 @@ public class AsmUtil {
         }
     }
 
+    public static void pushDefaultValueOnStack(@NotNull Type type, @NotNull InstructionAdapter v) {
+        if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
+            v.aconst(null);
+        }
+        else {
+            pushDefaultPrimitiveValueOnStack(type, v);
+        }
+    }
+
+    public static void pushDefaultPrimitiveValueOnStack(@NotNull Type type, @NotNull InstructionAdapter v) {
+        if (type.getSort() == Type.FLOAT) {
+            v.fconst(0);
+        }
+        else if (type.getSort() == Type.DOUBLE) {
+            v.dconst(0);
+        }
+        else if (type.getSort() == Type.LONG) {
+            v.lconst(0);
+        }
+        else {
+            v.iconst(0);
+        }
+    }
+
     public static Type comparisonOperandType(Type left, Type right) {
         if (left == Type.DOUBLE_TYPE || right == Type.DOUBLE_TYPE) return Type.DOUBLE_TYPE;
         if (left == Type.FLOAT_TYPE || right == Type.FLOAT_TYPE) return Type.FLOAT_TYPE;

compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java

@@ -2131,21 +2131,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
             }
             else if (resolvedValueArgument instanceof DefaultValueArgument) {
                 Type type = valueParameterTypes.get(index);
-                if (type.getSort() == Type.OBJECT || type.getSort() == Type.ARRAY) {
+                pushDefaultValueOnStack(type, v);
-                    v.aconst(null);
-                }
-                else if (type.getSort() == Type.FLOAT) {
-                    v.aconst(0f);
-                }
-                else if (type.getSort() == Type.DOUBLE) {
-                    v.aconst(0d);
-                }
-                else if (type.getSort() == Type.LONG) {
-                    v.aconst(0l);
-                }
-                else {
-                    v.iconst(0);
-                }
                 mask |= (1 << index);
             }
             else if (resolvedValueArgument instanceof VarargValueArgument) {

compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java

@@ -242,17 +242,8 @@ public abstract class StackValue {
             if (toType.getSort() == Type.OBJECT) {
                 putTuple0Instance(v);
             }
-            else if (toType == Type.LONG_TYPE) {
-                v.lconst(0);
-            }
-            else if (toType == Type.FLOAT_TYPE) {
-                v.fconst(0);
-            }
-            else if (toType == Type.DOUBLE_TYPE) {
-                v.dconst(0);
-            }
             else {
-                v.iconst(0);
+                pushDefaultPrimitiveValueOnStack(toType, v);
             }
         }
         else if (toType.equals(JET_TUPLE0_TYPE)) {