Backed out changeset a190978e94f1 (bug 1136806) for WinXP debug jittest timeouts.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 04 Mar 2015 14:02:01 -0500
changeset 231899 461dfb926e3969fe53e2999a82e3823aa47f1acf
parent 231898 d8d89cea541ef98de5ebb9ae27fcf168c04f6e3e
child 231900 608776d6b5d67b377e30a7103d8920ef00048e61
push id28362
push userryanvm@gmail.com
push dateWed, 04 Mar 2015 21:35:51 +0000
treeherdermozilla-central@56492f7244a9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1136806
milestone39.0a1
backs outa190978e94f12f56dcf492269d606c7bdd7af978
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 a190978e94f1 (bug 1136806) for WinXP debug jittest timeouts. CLOSED TREE
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,8 +0,0 @@
-// |jit-test| allow-unhandlable-oom; allow-oom
-
-if (typeof oomAfterAllocations == "function") {
-  Debugger()
-  oomAfterAllocations(6)
-  Debugger()
-}
-
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -69,30 +69,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;