Bug 1533741 - Bustages on "ActorsParent.cpp" when Gecko 67 merges to beta on 2019-03-11; r=asuth
authorJan Varga <jan.varga@gmail.com>
Fri, 08 Mar 2019 16:28:52 +0100
changeset 521060 cda16de63d4129d30dfbc669eac7f540420d124e
parent 521059 97f72b9e4d74501eabb85f7aeb03eb4946f19338
child 521061 2de00f879e07cfb7b9b7eb4451cbd85c7ad12733
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersasuth
bugs1533741
milestone67.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
Bug 1533741 - Bustages on "ActorsParent.cpp" when Gecko 67 merges to beta on 2019-03-11; r=asuth Differential Revision: https://phabricator.services.mozilla.com/D22720
dom/quota/ActorsParent.cpp
--- a/dom/quota/ActorsParent.cpp
+++ b/dom/quota/ActorsParent.cpp
@@ -1169,16 +1169,18 @@ class StoragePressureRunnable final : pu
 
   NS_DECL_NSIRUNNABLE
 };
 
 /*******************************************************************************
  * Helper classes
  ******************************************************************************/
 
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
+
 class PrincipalVerifier final : public Runnable {
   nsTArray<PrincipalInfo> mPrincipalInfos;
 
  public:
   static already_AddRefed<PrincipalVerifier> CreateAndDispatch(
       nsTArray<PrincipalInfo>&& aPrincipalInfos);
 
  private:
@@ -1190,16 +1192,18 @@ class PrincipalVerifier final : public R
 
   virtual ~PrincipalVerifier() = default;
 
   bool IsPrincipalInfoValid(const PrincipalInfo& aPrincipalInfo);
 
   NS_DECL_NSIRUNNABLE
 };
 
+#endif
+
 /*******************************************************************************
  * Helper Functions
  ******************************************************************************/
 
 template <typename T, bool = mozilla::IsUnsigned<T>::value>
 struct IntChecker {
   static void Assert(T aInt) {
     static_assert(mozilla::IsIntegral<T>::value, "Not an integer!");
@@ -7740,16 +7744,18 @@ nsresult PersistOp::DoDirectoryWork(Quot
 }
 
 void PersistOp::GetResponse(RequestResponse& aResponse) {
   AssertIsOnOwningThread();
 
   aResponse = PersistResponse();
 }
 
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
+
 // static
 already_AddRefed<PrincipalVerifier> PrincipalVerifier::CreateAndDispatch(
     nsTArray<PrincipalInfo>&& aPrincipalInfos) {
   AssertIsOnIOThread();
 
   RefPtr<PrincipalVerifier> verifier =
       new PrincipalVerifier(std::move(aPrincipalInfos));
 
@@ -7824,16 +7830,18 @@ PrincipalVerifier::Run() {
 
   for (auto& principalInfo : mPrincipalInfos) {
     MOZ_DIAGNOSTIC_ASSERT(IsPrincipalInfoValid(principalInfo));
   }
 
   return NS_OK;
 }
 
+#endif
+
 nsresult StorageOperationBase::GetDirectoryMetadata(nsIFile* aDirectory,
                                                     int64_t& aTimestamp,
                                                     nsACString& aGroup,
                                                     nsACString& aOrigin,
                                                     Nullable<bool>& aIsApp) {
   AssertIsOnIOThread();
   MOZ_ASSERT(aDirectory);
 
@@ -7965,17 +7973,19 @@ nsresult StorageOperationBase::RemoveObs
 }
 
 nsresult StorageOperationBase::ProcessOriginDirectories() {
   AssertIsOnIOThread();
   MOZ_ASSERT(!mOriginProps.IsEmpty());
 
   nsresult rv;
 
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
   nsTArray<PrincipalInfo> principalInfos;
+#endif
 
   for (auto& originProps : mOriginProps) {
     switch (originProps.mType) {
       case OriginProps::eChrome: {
         QuotaManager::GetInfoForChrome(
             &originProps.mSuffix, &originProps.mGroup, &originProps.mOrigin);
         break;
       }
@@ -8003,35 +8013,39 @@ nsresult StorageOperationBase::ProcessOr
         contentPrincipalInfo.baseDomain() = baseDomain;
 
         PrincipalInfo principalInfo(contentPrincipalInfo);
 
         QuotaManager::GetInfoFromValidatedPrincipalInfo(
             principalInfo, &originProps.mSuffix, &originProps.mGroup,
             &originProps.mOrigin);
 
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
         principalInfos.AppendElement(principalInfo);
+#endif
 
         break;
       }
 
       case OriginProps::eObsolete: {
         // There's no way to get info for obsolete origins.
         break;
       }
 
       default:
         MOZ_CRASH("Bad type!");
     }
   }
 
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
   if (!principalInfos.IsEmpty()) {
     RefPtr<PrincipalVerifier> principalVerifier =
         PrincipalVerifier::CreateAndDispatch(std::move(principalInfos));
   }
+#endif
 
   // Don't try to upgrade obsolete origins, remove them right after we detect
   // them.
   for (auto& originProps : mOriginProps) {
     if (originProps.mType == OriginProps::eObsolete) {
       MOZ_ASSERT(originProps.mSuffix.IsEmpty());
       MOZ_ASSERT(originProps.mGroup.IsEmpty());
       MOZ_ASSERT(originProps.mOrigin.IsEmpty());