Backed out changeset b24fc518598d (bug 1209001) for bug-1209001.js failures
authorWes Kocher <wkocher@mozilla.com>
Tue, 29 Sep 2015 09:37:39 -0700
changeset 264991 84a0c01dcfdac8d25187b87c71e06eb81407c5e1
parent 264990 ed9ff02252b3fb18d05933ef6bbde221f4c2832b
child 264992 992ee69d7c2e58c0a245ece909c41710324dc6db
push id65812
push userkwierso@gmail.com
push dateTue, 29 Sep 2015 16:37:43 +0000
treeherdermozilla-inbound@84a0c01dcfda [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1209001
milestone44.0a1
backs outb24fc518598dee29dbc9998305605237e4bba3c6
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset b24fc518598d (bug 1209001) for bug-1209001.js failures
js/src/builtin/ModuleObject.cpp
js/src/jit-test/tests/gc/bug-1209001.js
--- a/js/src/builtin/ModuleObject.cpp
+++ b/js/src/builtin/ModuleObject.cpp
@@ -260,36 +260,32 @@ ModuleObject::isInstance(HandleValue val
 {
     return value.isObject() && value.toObject().is<ModuleObject>();
 }
 
 /* static */ ModuleObject*
 ModuleObject::create(ExclusiveContext* cx)
 {
     Rooted<ModuleObject*> self(cx, NewBuiltinClassInstance<ModuleObject>(cx, TenuredObject));
-    if (!self)
-        return nullptr;
 
     IndirectBindingMap* bindings = cx->new_<IndirectBindingMap>();
     if (!bindings || !bindings->init()) {
         ReportOutOfMemory(cx);
         return nullptr;
     }
 
     self->setReservedSlot(ImportBindingsSlot, PrivateValue(bindings));
 
     return self;
 }
 
 /* static */ void
 ModuleObject::finalize(js::FreeOp* fop, JSObject* obj)
 {
-    ModuleObject* self = &obj->as<ModuleObject>();
-    if (!self->getReservedSlot(ImportBindingsSlot).isUndefined())
-        fop->delete_(&self->importBindings());
+    fop->delete_(&obj->as<ModuleObject>().importBindings());
 }
 
 ModuleEnvironmentObject*
 ModuleObject::environment() const
 {
     Value value = getReservedSlot(EnvironmentSlot);
     if (value.isUndefined())
         return nullptr;
deleted file mode 100644
--- a/js/src/jit-test/tests/gc/bug-1209001.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// |jit-test| --no-threads
-
-load(libdir + 'oomTest.js');
-oomTest(() => parseModule('import v from "mod";'));