b=604196; jsval return types in xpidl are broken (non-quickstubs); r=jorendorff, a=b
authorVladimir Vukicevic <vladimir@pobox.com>
Fri, 12 Nov 2010 12:01:50 -0800
changeset 57417 d3790fe503e562119fa47d77a0f4f8d1a19705a9
parent 57416 83ef401a4f255ff1b35f1afe6feb6dc6094310e0
child 57418 108a14f0216a6b52b50b2cbb4b48f35d22b35496
push id16915
push uservladimir@mozilla.com
push dateFri, 12 Nov 2010 20:05:54 +0000
treeherdermozilla-central@ae610cd9842c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff, b
bugs604196
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
b=604196; jsval return types in xpidl are broken (non-quickstubs); r=jorendorff, a=b
js/src/xpconnect/src/xpcconvert.cpp
--- a/js/src/xpconnect/src/xpcconvert.cpp
+++ b/js/src/xpconnect/src/xpcconvert.cpp
@@ -285,18 +285,17 @@ XPCConvert::NativeData2JS(XPCLazyCallCon
             if(!(str = JS_NewUCStringCopyN(cx, p, 1)))
                 return JS_FALSE;
             *d = STRING_TO_JSVAL(str);
             break;
         }
 
     case nsXPTType::T_JSVAL :
         {
-            JS_STATIC_ASSERT(sizeof(jsval) <= sizeof(uint64));
-            *d = **((jsval**)s);
+            *d = *((jsval*)s);
 
             JSAutoEnterCompartment ac;
             XPCCallContext &ccx = lccx.GetXPCCallContext();
             if(ccx.GetXPCContext()->CallerTypeIsNative())
             {
                 JSObject *jsscope = ccx.GetCallee();
                 if(!jsscope || !JS_ObjectIsFunction(ccx, jsscope))
                     jsscope = JS_GetGlobalForObject(ccx, scope);