Backed out changeset 2ceca4816688 (bug 854614) for intermittent mochitest-a11y crashes on a CLOSED TREE.

js/xpconnect/src/qsgen.py

@@ -475,7 +475,7 @@ argumentUnboxingTemplates = {
         "        return JS_FALSE;\n",
 
     '[jsval]':
-        "    JS::RootedValue ${name}(cx, ${argVal});\n"
+        "    jsval ${name} = ${argVal};\n"
     }
 
 # From JSData2Native.
@@ -510,12 +510,7 @@ def writeArgumentUnboxing(f, i, name, type, optional, rvdeclared,
         else:
             val = "JSVAL_NULL"
         argVal = "(%d < argc ? argv[%d] : %s)" % (i, i, val)
-        if typeName == "[jsval]":
-            # This should use the rooted argument,
-            # however we probably won't ever need to support that.
-            argPtr = None
-        else:
-            argPtr = "(%d < argc ? &argv[%d] : NULL)" % (i, i)
+        argPtr = "(%d < argc ? &argv[%d] : NULL)" % (i, i)
     else:
         argVal = "argv[%d]" % i
         argPtr = "&" + argVal
@@ -595,7 +590,7 @@ def writeResultDecl(f, type, varname):
             f.write("    nsString %s;\n" % varname)
             return
         elif name == '[jsval]':
-            f.write("    JS::RootedValue %s(cx);\n" % varname)
+            f.write("    jsval %s;\n" % varname)
             return
     elif t.kind in ('interface', 'forward'):
         f.write("    nsCOMPtr<%s> %s;\n" % (type.name, varname))
@@ -610,7 +605,7 @@ def outParamForm(name, type):
         return '&' + name
     elif type.kind == 'native':
         if getBuiltinOrNativeTypeName(type) == '[jsval]':
-            return name + '.address()'
+            return '&' + name
         elif type.modifier == 'ref':
             return name
         else:
@@ -950,7 +945,7 @@ def writeQuickStub(f, customMethodCalls, stringtable, member, stubName,
             if member.implicit_jscontext:
                 argv.append('cx')
             if member.optional_argc:
-                argv.append('std::min<uint32_t>(argc, %d) - %d' %
+                argv.append('std::min<uint32_t>(argc, %d) - %d' % 
                             (len(member.params), requiredArgs))
             if not isVoidType(member.realtype):
                 argv.append(outParamForm(resultname, member.realtype))