Backout 8b61aebcd9bc (bug 1183195) for x64 Windows 8 JIT failures

This commit is contained in:
Nathan Froyd 2015-08-19 20:13:48 -04:00
parent 5d583a2009
commit e55f3300f2
2 changed files with 2 additions and 13 deletions

View File

@ -1,9 +0,0 @@
// |jit-test| allow-oom; allow-unhandlable-oom
if (!('oomAfterAllocations' in this))
quit();
var buffer = new ArrayBuffer(100);
view = new DataView(buffer, undefined, undefined);
oomAfterAllocations(10);
view = new DataView(buffer, 20, undefined);

View File

@ -1056,10 +1056,8 @@ InnerViewTable::addView(JSContext* cx, ArrayBufferObject* obj, ArrayBufferViewOb
}
}
if (!views.append(view)) {
ReportOutOfMemory(cx);
if (!views.append(view))
return false;
}
} else {
if (!map.add(p, obj, ViewVector()))
return false;
@ -1130,7 +1128,7 @@ InnerViewTable::sweep(JSRuntime* rt)
void
InnerViewTable::sweepAfterMinorGC(JSRuntime* rt)
{
MOZ_ASSERT(needsSweepAfterMinorGC());
MOZ_ASSERT(!nurseryKeys.empty());
if (nurseryKeysValid) {
for (size_t i = 0; i < nurseryKeys.length(); i++) {