diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java b/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java
index 83dc72254e6..8bd906a03b6 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/Interpreter.java
@@ -1871,14 +1871,8 @@ public class Interpreter extends LabelTable {
                         int lineNum = getShort(iCode, pc + 1);   
                         name = strings[getShort(iCode, pc + 3)];
                         count = getShort(iCode, pc + 5);
-                        outArgs = new Object[count];
-                        for (i = count - 1; i >= 0; i--) {
-                            val = stack[stackTop];    
-                            if (val == DBL_MRK) 
-                                val = doubleWrap(sDbl[stackTop]);
-                            outArgs[i] = val;
-                            --stackTop;
-                        }
+                        outArgs = getArgsArray(stack, sDbl, stackTop, count);
+                        stackTop -= count;
                         rhs = stack[stackTop];    
                         if (rhs == DBL_MRK) rhs = doubleWrap(sDbl[stackTop]);
                         --stackTop;
@@ -1898,14 +1892,8 @@ public class Interpreter extends LabelTable {
                         }
                         cx.instructionCount = instructionCount;
                         count = getShort(iCode, pc + 3);
-                        outArgs = new Object[count];
-                        for (i = count - 1; i >= 0; i--) {
-                            val = stack[stackTop];    
-                            if (val == DBL_MRK) 
-                                val = doubleWrap(sDbl[stackTop]);
-                            outArgs[i] = val;
-                            --stackTop;
-                        }
+                        outArgs = getArgsArray(stack, sDbl, stackTop, count);
+                        stackTop -= count;
                         rhs = stack[stackTop];    
                         if (rhs == DBL_MRK) rhs = doubleWrap(sDbl[stackTop]);
                         --stackTop;
@@ -1931,14 +1919,8 @@ public class Interpreter extends LabelTable {
                             instructionCount = -1;
                         }
                         count = getShort(iCode, pc + 3);
-                        outArgs = new Object[count];
-                        for (i = count - 1; i >= 0; i--) {
-                            val = stack[stackTop];    
-                            if (val == DBL_MRK) 
-                                val = doubleWrap(sDbl[stackTop]);
-                            outArgs[i] = val;
-                            --stackTop;
-                        }
+                        outArgs = getArgsArray(stack, sDbl, stackTop, count);
+                        stackTop -= count;
                         lhs = stack[stackTop];    
                         if (lhs == DBL_MRK) lhs = doubleWrap(sDbl[stackTop]);
                         if (lhs == undefined && getShort(iCode, pc + 1) != -1) 
@@ -2436,6 +2418,23 @@ public class Interpreter extends LabelTable {
         return result;
     }
     
+    private static Object[] getArgsArray(Object[] stack, double[] sDbl,
+                                         int stackTop, int count)
+    {
+        if (count == 0) { 
+            return ScriptRuntime.emptyArgs; 
+        }
+        Object[] args = new Object[count];
+        do {
+            Object val = stack[stackTop];    
+            if (val == DBL_MRK) 
+                val = doubleWrap(sDbl[stackTop]);
+            args[--count] = val;
+            --stackTop;
+        } while (count != 0); 
+        return args;
+    }
+    
     private int version;
     private boolean inLineStepMode;
     private StringBuffer debugSource;