Title: [179652] trunk/Source/_javascript_Core
- Revision
- 179652
- Author
- [email protected]
- Date
- 2015-02-04 16:50:01 -0800 (Wed, 04 Feb 2015)
Log Message
Gardening: Changed expected ERROR message to WARNING to make test bots happy.
Rubber stamped by Simon Fraser.
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::tryCopyOtherThreadStacks):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (179651 => 179652)
--- trunk/Source/_javascript_Core/ChangeLog 2015-02-05 00:38:55 UTC (rev 179651)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-02-05 00:50:01 UTC (rev 179652)
@@ -1,5 +1,14 @@
2015-02-04 Mark Lam <[email protected]>
+ Gardening: Changed expected ERROR message to WARNING to make test bots happy.
+
+ Rubber stamped by Simon Fraser.
+
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::tryCopyOtherThreadStacks):
+
+2015-02-04 Mark Lam <[email protected]>
+
r179576 introduce a deadlock potential during GC thread suspension.
<https://webkit.org/b/141268>
Modified: trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp (179651 => 179652)
--- trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp 2015-02-05 00:38:55 UTC (rev 179651)
+++ trunk/Source/_javascript_Core/heap/MachineStackMarker.cpp 2015-02-05 00:50:01 UTC (rev 179652)
@@ -467,8 +467,7 @@
kern_return_t error = thread_suspend(thread->platformThread);
ASSERT(error != KERN_SUCCESS);
- WTFReportError(__FILE__, __LINE__, WTF_PRETTY_FUNCTION,
- "_javascript_ garbage collection encountered an invalid thread (err 0x%x): Thread [%d/%d: %p] platformThread %p.",
+ WTFLogAlways("WARNING: _javascript_ garbage collection encountered an invalid thread (err 0x%x): Thread [%d/%d: %p] platformThread %p.",
error, index, numberOfThreads, thread, reinterpret_cast<void*>(thread->platformThread));
// Put the invalid thread on the threadsToBeDeleted list.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes