Bug 1258087 - Fix -Wunreachable-code warning in StartupCache.cpp on macosx64-mulet. r=froydnj
authorChris Peterson <cpeterson@mozilla.com>
Sat, 19 Mar 2016 00:10:16 -0700
changeset 289979 6fd69516a3213ec6bf4c3e57b82faa40201bb6f1
parent 289978 bbfbdaa25c6cc26f122a4eafbe84c61d381682d8
child 289980 eb458f5d7b326bd0befe11f503b592b15b10e9e7
push id30112
push usercbook@mozilla.com
push dateWed, 23 Mar 2016 15:25:32 +0000
treeherderautoland@6202ade0e6d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1258087
milestone48.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 1258087 - Fix -Wunreachable-code warning in StartupCache.cpp on macosx64-mulet. r=froydnj
startupcache/StartupCache.cpp
--- a/startupcache/StartupCache.cpp
+++ b/startupcache/StartupCache.cpp
@@ -87,19 +87,19 @@ StartupCache*
 StartupCache::GetSingleton()
 {
   if (!gStartupCache) {
     if (!XRE_IsParentProcess()) {
       return nullptr;
     }
 #ifdef MOZ_DISABLE_STARTUPCACHE
     return nullptr;
+#else
+    StartupCache::InitSingleton();
 #endif
-
-    StartupCache::InitSingleton();
   }
 
   return StartupCache::gStartupCache;
 }
 
 void
 StartupCache::DeleteSingleton()
 {