webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 6 insertions, 5 deletions

diff --git a/Source/JavaScriptCore/runtime/InitializeThreading.cpp b/Source/JavaScriptCore/runtime/InitializeThreading.cpp
index d74460f20..1cb5e7abf 100644
--- a/Source/JavaScriptCore/runtime/InitializeThreading.cpp
+++ b/Source/JavaScriptCore/runtime/InitializeThreading.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 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 Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Computer, 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,6 @@
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "LLIntData.h"
-#include "StructureIDTable.h"
 #include "WriteBarrier.h"
 #include <mutex>
 #include <wtf/dtoa.h>
@@ -56,6 +55,7 @@ void initializeThreading()
     std::call_once(initializeThreadingOnceFlag, []{
         WTF::double_conversion::initialize();
         WTF::initializeThreading();
+        GlobalJSLock::initialize();
         Options::initialize();
         if (Options::recordGCPauseTimes())
             HeapStatistics::initialize();
@@ -65,12 +65,13 @@ void initializeThreading()
 #if ENABLE(ASSEMBLER)
         ExecutableAllocator::initializeAllocator();
 #endif
+        JSStack::initializeThreading();
+#if ENABLE(LLINT)
         LLInt::initialize();
+#endif
 #ifndef NDEBUG
         DisallowGC::initialize();
 #endif
-        WTFThreadData& threadData = wtfThreadData();
-        threadData.setSavedLastStackTop(threadData.stack().origin());
     });
 }