Title: [227309] branches/safari-605-branch/Source/_javascript_Core
- Revision
- 227309
- Author
- jmarc...@apple.com
- Date
- 2018-01-22 09:57:25 -0800 (Mon, 22 Jan 2018)
Log Message
Cherry-pick r227159. rdar://problem/36722618
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (227308 => 227309)
--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-22 17:57:23 UTC (rev 227308)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-22 17:57:25 UTC (rev 227309)
@@ -1,5 +1,22 @@
2018-01-22 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r227159. rdar://problem/36722618
+
+ 2018-01-18 Mark Lam <mark....@apple.com>
+
+ Poisons should be initialized after Options are initialized.
+ https://bugs.webkit.org/show_bug.cgi?id=181807
+ <rdar://problem/36629138>
+
+ Reviewed by Keith Miller.
+
+ This is because poison initialization may depend on options.
+
+ * runtime/InitializeThreading.cpp:
+ (JSC::initializeThreading):
+
+2018-01-22 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r227136. rdar://problem/36722486
2018-01-18 Commit Queue <commit-qu...@webkit.org>
Modified: branches/safari-605-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp (227308 => 227309)
--- branches/safari-605-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp 2018-01-22 17:57:23 UTC (rev 227308)
+++ branches/safari-605-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp 2018-01-22 17:57:25 UTC (rev 227309)
@@ -59,8 +59,8 @@
std::call_once(initializeThreadingOnceFlag, []{
WTF::initializeThreading();
+ Options::initialize();
initializePoison();
- Options::initialize();
#if ENABLE(WRITE_BARRIER_PROFILING)
WriteBarrierCounters::initialize();
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
