corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out e4c82a6b298c, 036194408a50, 39acc9f51df8 (bug 714647 and followups) because of test_finalizer.js crashes in Linux64 PGO builds

Browse Source
This commit is contained in:
Matt Brubeck
2012-04-12 22:07:43 -07:00
parent be481d84f3
commit c5e4bddc54
82 changed files with 1061 additions and 1362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsdate.cpp
View File

@@ -502,8 +502,7 @@ date_convert(JSContext *cx, JSObject *obj, JSType hint, Value *vp)
JS_ASSERT(hint == JSTYPE_NUMBER || hint == JSTYPE_STRING || hint == JSTYPE_VOID);
JS_ASSERT(obj->isDate());
return DefaultValue(cx, RootedVarObject(cx, obj),
(hint == JSTYPE_VOID) ? JSTYPE_STRING : hint, vp);
return DefaultValue(cx, obj, (hint == JSTYPE_VOID) ? JSTYPE_STRING : hint, vp);
}
/*
@@ -2665,15 +2664,14 @@ js_InitDateClass(JSContext *cx, JSObject *obj)
/* Set the static LocalTZA. */
LocalTZA = -(PRMJ_LocalGMTDifference() * msPerSecond);
RootedVar<GlobalObject*> global(cx, &obj->asGlobal());
GlobalObject *global = &obj->asGlobal();
RootedVarObject dateProto(cx, global->createBlankPrototype(cx, &DateClass));
JSObject *dateProto = global->createBlankPrototype(cx, &DateClass);
if (!dateProto)
return NULL;
SetDateToNaN(cx, dateProto);
RootedVarFunction ctor(cx);
ctor = global->createConstructor(cx, js_Date, CLASS_ATOM(cx, Date), MAXARGS);
JSFunction *ctor = global->createConstructor(cx, js_Date, CLASS_ATOM(cx, Date), MAXARGS);
if (!ctor)
return NULL;