Fix for bug 488561 (Typo in dom_quickstubs.qsconf). r=bent, sr=mrbkap.
authorPeter Van der Beken <peterv@propagandism.org>
Fri, 24 Apr 2009 12:36:14 +0200
changeset 27707 6be4295f5ac94d4dedc50ad61f6332a186032998
parent 27706 9583c67570f5b3ad93b7a209f4828042eae70c7a
child 27708 0fae24feb57a02c353d629745050924aea859732
push id6713
push userpvanderbeken@mozilla.com
push dateFri, 24 Apr 2009 11:46:08 +0000
treeherdermozilla-central@6be4295f5ac9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbent, mrbkap
bugs488561
milestone1.9.2a1pre
Fix for bug 488561 (Typo in dom_quickstubs.qsconf). r=bent, sr=mrbkap.
js/src/xpconnect/src/qsgen.py
--- a/js/src/xpconnect/src/qsgen.py
+++ b/js/src/xpconnect/src/qsgen.py
@@ -910,17 +910,17 @@ traceableArgumentConversionTemplates = {
           "JS_GetStringLength(${argVal}));\n"
           "    const char *${name} = ${name}_utf8.get();\n",
     'wstring':
           "    const PRUnichar *${name} = JS_GetStringChars({argVal});\n",
     }
 
 def writeTraceableArgumentConversion(f, member, i, name, type, haveCcx,
                                      rvdeclared):
-    argVal = "arg%d" % i
+    argVal = "_arg%d" % i
     argPtr = "&" + argVal
 
     params = {
         'name': name,
         'argVal': argVal
         }
 
     typeName = getBuiltinOrNativeTypeName(type)
@@ -1036,17 +1036,17 @@ def writeTraceableQuickStub(f, customMet
     # Write the function
     f.write("static %sFASTCALL\n" % getTraceType(member.type))
     f.write("%s(JSContext *cx, JSObject *obj" % (stubName + "_tn"))
     if haveCcx:
         f.write(", JSObject *callee")
         traceInfo["params"].append("CALLEE")
     for i, param in enumerate(member.params):
         type = getBuiltinOrNativeTypeName(param.realtype)
-        f.write(", %sarg%d" % (getTraceType(type), i))
+        f.write(", %s_arg%d" % (getTraceType(type), i))
         traceInfo["params"].append(getTraceInfoType(type))
     f.write(")\n{\n");
     f.write("    XPC_QS_ASSERT_CONTEXT_OK(cx);\n")
 
     # Create ccx if needed.
     if haveCcx:
         f.write("    XPCCallContext ccx(JS_CALLER, cx, obj, callee);\n")
 
@@ -1067,17 +1067,17 @@ def writeTraceableQuickStub(f, customMet
 
     argNames = []
 
     # Convert in-parameters.
     rvdeclared = False
     for i, param in enumerate(member.params):
         validateParam(member, param)
         type = unaliasType(param.realtype)
-        argName = "_arg%d" % i
+        argName = "arg%d" % i
         rvdeclared = writeTraceableArgumentConversion(f, member, i, argName,
                                                       param.realtype,
                                                       haveCcx, rvdeclared)
         argNames.append(argName)
 
     if customMethodCall is not None:
         f.write("%s\n" % customMethodCall['code'])
         f.write("#ifdef DEBUG\n")