#402: M1355039, tune up M1356755

docshell/base/nsDocShell.cpp

@@ -5323,11 +5323,16 @@ nsDocShell::Reload(uint32_t aReloadFlags)
       }
     }
 
-    rv = InternalLoad(mCurrentURI,
+    // Stack variables to ensure changes to the member variables don't affect
+    // the call.
+    nsCOMPtr<nsIURI> currentURI = mCurrentURI;
+    nsCOMPtr<nsIURI> referrerURI = mReferrerURI;
+    uint32_t referrerPolicy = mReferrerPolicy;
+    rv = InternalLoad(currentURI,
                       originalURI,
                       loadReplace,
-                      mReferrerURI,
-                      mReferrerPolicy,
+                      referrerURI,
+                      referrerPolicy,
                       principal,
                       flags,
                       nullptr,         // No window target

dom/base/nsGlobalWindow.cpp

@@ -9411,7 +9411,7 @@ void
 nsGlobalWindow::SetActive(bool aActive)
 {
   nsPIDOMWindow::SetActive(aActive);
-  if (mDoc) {
+  if (MOZ_LIKELY(mDoc)) {
     NotifyDocumentTree(mDoc, nullptr);
   }
 }