Backed out changeset 074919869975 (bug 1136806) for spidermonkey_info-warnaserr build test failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 03 Mar 2015 10:13:43 +0100
changeset 246971 765a823e848aa576875462aae6c616075fdf446c
parent 246970 4ef647d61d1f919a8258f0130be7ef133e624cbb
child 246972 6f507d09cfec8692811f15cc87a070ea8c88ef5d
push id884
push userdburns@mozilla.com
push dateTue, 03 Mar 2015 15:29:12 +0000
bugs1136806
milestone39.0a1
backs out0749198699758ec92f5afe029f5188d914c9a5a3
Backed out changeset 074919869975 (bug 1136806) for spidermonkey_info-warnaserr build test failures
js/src/jit-test/tests/debug/bug-1136806.js
js/src/vm/Debugger.h
deleted file mode 100644
--- a/js/src/jit-test/tests/debug/bug-1136806.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// |jit-test| allow-unhandlable-oom; allow-oom
-Debugger()
-oomAfterAllocations(6)
-Debugger()
-
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -65,30 +65,19 @@ class DebuggerWeakMap : private WeakMap<
                     uintptr_t,
                     DefaultHasher<JS::Zone *>,
                     RuntimeAllocPolicy> CountMap;
 
     CountMap zoneCounts;
 
   public:
     typedef WeakMap<Key, Value, DefaultHasher<Key> > Base;
-
     explicit DebuggerWeakMap(JSContext *cx)
         : Base(cx), zoneCounts(cx->runtime()) { }
 
-    ~DebuggerWeakMap() {
-        // If our owning Debugger fails construction after already initializing
-        // this DebuggerWeakMap, we need to make sure that we aren't in the
-        // compartment's weak map list anymore. Normally, when we are destroyed
-        // because the GC finds us unreachable, the GC takes care of removing us
-        // from this list.
-        if (WeakMapBase::isInList())
-            WeakMapBase::removeWeakMapFromList(this);
-    }
-
   public:
     /* Expose those parts of HashMap public interface that are used by Debugger methods. */
 
     typedef typename Base::Entry Entry;
     typedef typename Base::Ptr Ptr;
     typedef typename Base::AddPtr AddPtr;
     typedef typename Base::Range Range;
     typedef typename Base::Enum Enum;