Title: [187308] branches/safari-601.1-branch/Source/_javascript_Core
- Revision
- 187308
- Author
- [email protected]
- Date
- 2015-07-24 00:54:00 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187139. rdar://problem/21847618
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/_javascript_Core/ChangeLog (187307 => 187308)
--- branches/safari-601.1-branch/Source/_javascript_Core/ChangeLog 2015-07-24 07:08:50 UTC (rev 187307)
+++ branches/safari-601.1-branch/Source/_javascript_Core/ChangeLog 2015-07-24 07:54:00 UTC (rev 187308)
@@ -1,3 +1,14 @@
+2015-07-24 Matthew Hanson <[email protected]>
+
+ Merge r187139. rdar://problem/21847618
+
+ 2015-07-21 Filip Pizlo <[email protected]>
+
+ Unreviewed, fix a lot of tests. Need to initialize WTF threading sooner.
+
+ * jsc.cpp:
+ (main):
+
2015-07-23 Lucas Forschler <[email protected]>
Merge r187125
Modified: branches/safari-601.1-branch/Source/_javascript_Core/jsc.cpp (187307 => 187308)
--- branches/safari-601.1-branch/Source/_javascript_Core/jsc.cpp 2015-07-24 07:08:50 UTC (rev 187307)
+++ branches/safari-601.1-branch/Source/_javascript_Core/jsc.cpp 2015-07-24 07:54:00 UTC (rev 187308)
@@ -1247,6 +1247,11 @@
ecore_init();
#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) {
dataLog(
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
