Merge mozilla-central into mozilla-inbound on a CLOSED TREE

2012-05-02 21:52:33 -04:00
parent f80091422e 90ba3c6f26
commit cc57e4a883
17 changed files with 404 additions and 124 deletions
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -375,12 +375,12 @@ frontend::CompileFunctionBody(JSContext *cx, JSFunction *fun,
             * NB: do not use AutoLocalNameArray because it will release space
             * allocated from cx->tempLifoAlloc by DefineArg.
             */
-            Vector<JSAtom *> names(cx);
+            BindingNames names(cx);
            if (!funbce.bindings.getLocalNameArray(cx, &names)) {
                fn = NULL;
            } else {
                for (unsigned i = 0; i < nargs; i++) {
-                    if (!DefineArg(fn, names[i], i, &funbce)) {
+                    if (!DefineArg(fn, names[i].maybeAtom, i, &funbce)) {
                        fn = NULL;
                        break;
                    }