Back out the null-check workaround for bug 1182197 on trunk, so we can see what the stacks look like after all via crash-stats data on nightly and dev channel.
authorBoris Zbarsky <bzbarsky@mit.edu>
Fri, 18 Sep 2015 13:38:42 -0400
changeset 297613 28161d563685be3cafcc1a47dc08aed4dec67cdc
parent 297612 b5c142ca240b80d6ba072553de6d47ccd43d6d25
child 297614 a08287c70962145364545c1a72135f9338544e9e
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1182197
milestone43.0a1
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
Back out the null-check workaround for bug 1182197 on trunk, so we can see what the stacks look like after all via crash-stats data on nightly and dev channel.
dom/promise/Promise.cpp
--- a/dom/promise/Promise.cpp
+++ b/dom/promise/Promise.cpp
@@ -1363,17 +1363,17 @@ Promise::Settle(JS::Handle<JS::Value> aV
         JS_ClearPendingException(cx);
       }
     } else {
       JS_ClearPendingException(cx);
     }
   }
 #endif
 
-  if (!mGlobal || mGlobal->IsDying()) {
+  if (mGlobal->IsDying()) {
     return;
   }
 
   mSettlementTimestamp = TimeStamp::Now();
 
   SetResult(aValue);
   SetState(aState);