webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 12 deletions

diff --git a/Source/JavaScriptCore/runtime/InitializeThreading.cpp b/Source/JavaScriptCore/runtime/InitializeThreading.cpp
index 1cb5e7abf..90eee7a0c 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-2016 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. 
  *
@@ -31,17 +31,19 @@
 
 #include "ExecutableAllocator.h"
 #include "Heap.h"
-#include "HeapStatistics.h"
-#include "Options.h"
 #include "Identifier.h"
 #include "JSDateMath.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "LLIntData.h"
+#include "Options.h"
+#include "StructureIDTable.h"
+#include "SuperSampler.h"
 #include "WriteBarrier.h"
 #include <mutex>
-#include <wtf/dtoa.h>
+#include <wtf/MainThread.h>
 #include <wtf/Threading.h>
+#include <wtf/dtoa.h>
 #include <wtf/dtoa/cached-powers.h>
 
 using namespace WTF;
@@ -53,25 +55,21 @@ void initializeThreading()
     static std::once_flag initializeThreadingOnceFlag;
 
     std::call_once(initializeThreadingOnceFlag, []{
-        WTF::double_conversion::initialize();
         WTF::initializeThreading();
-        GlobalJSLock::initialize();
         Options::initialize();
-        if (Options::recordGCPauseTimes())
-            HeapStatistics::initialize();
 #if ENABLE(WRITE_BARRIER_PROFILING)
         WriteBarrierCounters::initialize();
 #endif
 #if ENABLE(ASSEMBLER)
         ExecutableAllocator::initializeAllocator();
 #endif
-        JSStack::initializeThreading();
-#if ENABLE(LLINT)
         LLInt::initialize();
-#endif
 #ifndef NDEBUG
         DisallowGC::initialize();
 #endif
+        initializeSuperSampler();
+        WTFThreadData& threadData = wtfThreadData();
+        threadData.setSavedLastStackTop(threadData.stack().origin());
     });
 }