Backed out changeset 8f99f32e4bfb (bug 1207863) for SM(e) failures

This commit is contained in:
Wes Kocher 2015-09-30 15:16:37 -07:00
parent 66893c0ba1
commit 5d11bb91e2
2 changed files with 0 additions and 23 deletions

View File

@ -1,21 +0,0 @@
// |jit-test| allow-oom; allow-unhandlable-oom
function oomTest(f) {
var i = 1;
do {
try {
oomAtAllocation(i);
f();
} catch (e) {
more = resetOOMFailure();
}
i++;
} while(more);
}
oomTest(
() => 3
| (function () {
"use strict";
return eval("f();");
})()
);

View File

@ -1280,9 +1280,7 @@ ScopeIter::settle()
MOZ_ASSERT(ssi_.type() == StaticScopeIter<CanGC>::Block);
incrementStaticScopeIter();
MOZ_ASSERT(ssi_.type() == StaticScopeIter<CanGC>::Eval);
MOZ_ASSERT(maybeStaticScope() == frame_.script()->enclosingStaticScope());
incrementStaticScopeIter();
frame_ = NullFramePtr();
}
// Check if we have left the extent of the initial frame after we've