Merge debugger changes into trunk.

js/rhino/org/mozilla/javascript/Interpreter.java

@@ -126,7 +126,7 @@ public class Interpreter extends LabelTable {
             regExpLiterals = generateRegExpLiterals(cx, scope, regexps);
         
         VariableTable varTable = (VariableTable)tree.getProp(Node.VARS_PROP);
-        generateICodeFromTree(tree, varTable, false, securityDomain);
+        generateICodeFromTree(tree, varTable, cx.isGeneratingDebug(), securityDomain);
         itsData.itsNestedFunctions = itsNestedFunctions;
         itsData.itsRegExpLiterals = regExpLiterals;
         if (printICode) dumpICode(itsData);
@@ -2001,4 +2001,4 @@ public class Interpreter extends LabelTable {
     private int version;
     private boolean inLineStepMode;
     private StringBuffer debugSource;
-}
+}

js/rhino/org/mozilla/javascript/NativeCall.java

@@ -49,7 +49,7 @@ public final class NativeCall extends ScriptableObject {
                Scriptable thisObj, Object[] args)
     {
         this(cx, scope, funObj, thisObj);
-        this.originalArgs = args;
+        this.originalArgs = (args == null) ? ScriptRuntime.emptyArgs : args;
         
         // initialize values of arguments
         String[] names = funObj.names;

js/rhino/src/org/mozilla/javascript/Interpreter.java

@@ -126,7 +126,7 @@ public class Interpreter extends LabelTable {
             regExpLiterals = generateRegExpLiterals(cx, scope, regexps);
         
         VariableTable varTable = (VariableTable)tree.getProp(Node.VARS_PROP);
-        generateICodeFromTree(tree, varTable, false, securityDomain);
+        generateICodeFromTree(tree, varTable, cx.isGeneratingDebug(), securityDomain);
         itsData.itsNestedFunctions = itsNestedFunctions;
         itsData.itsRegExpLiterals = regExpLiterals;
         if (printICode) dumpICode(itsData);
@@ -2001,4 +2001,4 @@ public class Interpreter extends LabelTable {
     private int version;
     private boolean inLineStepMode;
     private StringBuffer debugSource;
-}
+}

js/rhino/src/org/mozilla/javascript/NativeCall.java

@@ -49,7 +49,7 @@ public final class NativeCall extends ScriptableObject {
                Scriptable thisObj, Object[] args)
     {
         this(cx, scope, funObj, thisObj);
-        this.originalArgs = args;
+        this.originalArgs = (args == null) ? ScriptRuntime.emptyArgs : args;
         
         // initialize values of arguments
         String[] names = funObj.names;