1 files changed, 21 insertions, 31 deletions
diff --git a/Source/JavaScriptCore/runtime/InitializeThreading.cpp b/Source/JavaScriptCore/runtime/InitializeThreading.cpp
index 1a6c84514..d74460f20 100644
--- a/Source/JavaScriptCore/runtime/InitializeThreading.cpp
+++ b/Source/JavaScriptCore/runtime/InitializeThreading.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission. 
  *
@@ -38,7 +38,9 @@
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "LLIntData.h"
+#include "StructureIDTable.h"
 #include "WriteBarrier.h"
+#include <mutex>
 #include <wtf/dtoa.h>
 #include <wtf/Threading.h>
 #include <wtf/dtoa/cached-powers.h>
@@ -47,41 +49,29 @@ using namespace WTF;
 
 namespace JSC {
 
-#if OS(DARWIN)
-static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
-#endif
-
-static void initializeThreadingOnce()
+void initializeThreading()
 {
-    WTF::double_conversion::initialize();
-    WTF::initializeThreading();
-    GlobalJSLock::initialize();
-    Options::initialize();
-    if (Options::recordGCPauseTimes())
-        HeapStatistics::initialize();
+    static std::once_flag initializeThreadingOnceFlag;
+
+    std::call_once(initializeThreadingOnceFlag, []{
+        WTF::double_conversion::initialize();
+        WTF::initializeThreading();
+        Options::initialize();
+        if (Options::recordGCPauseTimes())
+            HeapStatistics::initialize();
 #if ENABLE(WRITE_BARRIER_PROFILING)
-    WriteBarrierCounters::initialize();
+        WriteBarrierCounters::initialize();
 #endif
 #if ENABLE(ASSEMBLER)
-    ExecutableAllocator::initializeAllocator();
-#endif
-    JSStack::initializeThreading();
-#if ENABLE(LLINT)
-    LLInt::initialize();
+        ExecutableAllocator::initializeAllocator();
 #endif
-}
-
-void initializeThreading()
-{
-#if OS(DARWIN)
-    pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
-#else
-    static bool initializedThreading = false;
-    if (!initializedThreading) {
-        initializeThreadingOnce();
-        initializedThreading = true;
-    }
+        LLInt::initialize();
+#ifndef NDEBUG
+        DisallowGC::initialize();
 #endif
+        WTFThreadData& threadData = wtfThreadData();
+        threadData.setSavedLastStackTop(threadData.stack().origin());
+    });
 }
 
 } // namespace JSC