Backed out changeset 8868bb11e7a8 (bug 1358251) for assertions on Windows

MozReview-Commit-ID: Laffk7TtWgP

mozglue/misc/StackWalk.cpp

@@ -283,17 +283,6 @@ PrintError(const char* aPrefix)
   LocalFree(lpMsgBuf);
 }
 
-static void
-InitializeDbgHelpCriticalSection()
-{
-  static bool initialized = false;
-  if (initialized) {
-    return;
-  }
-  ::InitializeCriticalSection(&gDbgHelpCS);
-  initialized = true;
-}
-
 static unsigned int WINAPI WalkStackThread(void* aData);
 
 static bool
@@ -356,7 +345,7 @@ EnsureWalkThreadReady()
                            (void**)&stub_LdrResolveDelayLoadedAPI);
 #endif
 
-  InitializeDbgHelpCriticalSection();
+  ::InitializeCriticalSection(&gDbgHelpCS);
 
   return walkThreadReady = true;
 }
@@ -906,7 +895,9 @@ EnsureSymInitialized()
     return gInitialized;
   }
 
-  InitializeDbgHelpCriticalSection();
+  if (!EnsureWalkThreadReady()) {
+    return false;
+  }
 
   SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_UNDNAME);
   retStat = SymInitialize(GetCurrentProcess(), nullptr, TRUE);