Bug 808067 - Back out again due to possible orange (r=orange)

This commit is contained in:
Bill McCloskey 2012-11-05 17:22:54 -08:00
parent 35a5c3a7c6
commit 2aae7cd63a
3 changed files with 3 additions and 26 deletions

View File

@ -32,9 +32,5 @@ if (!("verifypostbarriers" in this)) {
verifypostbarriers = function() { }
}
if (!("gcPreserveCode" in this)) {
gcPreserveCode = function() { }
}
if ("options" in this)
options("allow_xml");

View File

@ -1,19 +0,0 @@
function TestCase(n, d, e, a)
this.reason = '';
function reportCompare (expected, actual, description) {
var output = "";
var testcase = new TestCase("unknown-test-name", description, expected, actual);
testcase.reason = output;
}
gcPreserveCode();
var summary = 'return with argument and lazy generator detection';
expect = "generator function foo returns a value";
actual = (function (j) {}).message;
reportCompare(expect, actual, summary + ": 1");
reportCompare(expect, actual, summary + ": 2");
gcslice(0);
gcslice(1);
gc();
var strings = [ (0), ];
for (var i = 0; i < strings.length; i++)
reportCompare(expect, actual, summary + (5e1) + strings[i]);

View File

@ -4079,7 +4079,7 @@ ResetIncrementalGC(JSRuntime *rt, const char *reason)
AutoCopyFreeListToArenas copy(rt);
for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
if (c->isGCMarking()) {
c->setNeedsBarrier(false, JSCompartment::UpdateIon);
c->setNeedsBarrier(false, JSCompartment::DontUpdateIon);
c->setGCState(JSCompartment::NoGC);
wasMarking = true;
}
@ -4154,12 +4154,12 @@ AutoGCSlice::AutoGCSlice(JSRuntime *rt)
AutoGCSlice::~AutoGCSlice()
{
/* We can't use GCCompartmentsIter if this is the end of the last slice. */
for (CompartmentsIter c(runtime); !c.done(); c.next()) {
for (GCCompartmentsIter c(runtime); !c.done(); c.next()) {
if (c->isGCMarking()) {
c->setNeedsBarrier(true, JSCompartment::UpdateIon);
c->arenas.prepareForIncrementalGC(runtime);
} else {
JS_ASSERT(c->isGCSweeping());
c->setNeedsBarrier(false, JSCompartment::UpdateIon);
}
}