Backed out changeset 1a7c349c2c60 (bug 1546892) for causing Bug 1528690 on a CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Wed, 08 May 2019 20:50:48 +0300
changeset 531916 c61887431ba86c0c8846ee7773aafe53d0d1f782
parent 531915 a51c08b24de339dea7f16b9f8a6f37acf0c0ed6c
child 531917 89ab5386f54bc1f39b5ea368cc3e6f0d2952e410
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1546892, 1528690
milestone68.0a1
backs out1a7c349c2c607bf7d0ed2d9a5851073343705fb9
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 1a7c349c2c60 (bug 1546892) for causing Bug 1528690 on a CLOSED TREE
dom/indexedDB/ActorsParent.cpp
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -9495,17 +9495,17 @@ void DatabaseConnection::FinishWriteTran
   }
 
   mInReadTransaction = true;
 }
 
 nsresult DatabaseConnection::StartSavepoint() {
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
-  MOZ_DIAGNOSTIC_ASSERT(mUpdateRefcountFunction);
+  MOZ_ASSERT(mUpdateRefcountFunction);
   MOZ_ASSERT(mInWriteTransaction);
 
   AUTO_PROFILER_LABEL("DatabaseConnection::StartSavepoint", DOM);
 
   CachedStatement stmt;
   nsresult rv = GetCachedStatement(NS_LITERAL_CSTRING(SAVEPOINT_CLAUSE), &stmt);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -10057,24 +10057,22 @@ nsresult DatabaseConnection::AutoSavepoi
              aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
              aTransaction->GetMode() == IDBTransaction::CLEANUP ||
              aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
 
   DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection();
   MOZ_ASSERT(connection);
   connection->AssertIsOnConnectionThread();
 
-#ifndef NIGHTLY_BUILD
   // This is just a quick fix for preventing accessing the nullptr. The cause is
   // probably because the connection was unexpectedly closed.
   if (!connection->GetUpdateRefcountFunction()) {
     NS_WARNING("The connection was closed for some reasons!");
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
   }
-#endif
 
   MOZ_ASSERT(!mConnection);
   MOZ_ASSERT(!mDEBUGTransaction);
 
   nsresult rv = connection->StartSavepoint();
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }