Changeset 187308 in webkit

Timestamp:

Jul 24, 2015, 12:54:00 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187139. rdar://problem/21847618

Location:

branches/safari-601.1-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (1 diff)

branches/safari-601.1-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187139. rdar://problem/21847618
+
+    2015-07-21  Filip Pizlo  <fpizlo@apple.com>
+
+            Unreviewed, fix a lot of tests. Need to initialize WTF threading sooner.
+
+            * jsc.cpp:
+            (main):
+
 2015-07-23  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/JavaScriptCore/jsc.cpp

@@ -1248 +1248 @@
 #endif
 
+    // Need to initialize WTF threading before we start any threads. Cannot initialize JSC
+    // threading yet, since that would do somethings that we'd like to defer until after we
+    // have a chance to parse options.
+    WTF::initializeThreading();
+
     if (char* timeoutString = getenv("JSC_timeout")) {
         if (sscanf(timeoutString, "%lf", &s_desiredTimeout) != 1) {