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

Back out 5f623a11c6cb (bug 713226), 1ed8ccf96402 (bug 721579), 32af27f89c49 (bug 722028), 1300d282fd22 (bug 716067), dc0f6ad7eff3 (bug 723313), 0d2ab3f2e9b9 (bug 723773) for talos crashes

Browse Source
This commit is contained in:
Phil Ringnalda
2012-02-10 19:47:48 -08:00
parent 6603f21695
commit 503b62e501
17 changed files with 105 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsiter.cpp
View File

@@ -1029,12 +1029,6 @@ SuppressDeletedPropertyHelper(JSContext *cx, JSObject *obj, StringPredicate pred
for (HeapPtr<JSFlatString> *p = idp; p + 1 != props_end; p++)
*p = *(p + 1);
ni->props_end = ni->end() - 1;
/*
* Invoke the write barrier on this element, since it's
* no longer going to be marked.
*/
ni->props_end->HeapPtr<JSFlatString>::~HeapPtr<JSFlatString>();
}
/* Don't reuse modified native iterators. */
@@ -1385,7 +1379,7 @@ MarkGenerator(JSTracer *trc, JSGenerator *gen)
* this code and save someone an hour later.
*/
MarkStackRangeConservatively(trc, gen->floatingStack, fp->formalArgsEnd());
fp->mark(trc);
js_TraceStackFrame(trc, fp);
MarkStackRangeConservatively(trc, fp->slots(), gen->regs.sp);
}