<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181296] tags/Safari-601.1.21.1/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181296">181296</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-03-09 16:57:55 -0700 (Mon, 09 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged patch for <rdar://problem/20080527>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6011211SourceJavaScriptCoreChangeLog">tags/Safari-601.1.21.1/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari6011211SourceJavaScriptCorebytecodeCodeBlockcpp">tags/Safari-601.1.21.1/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#tagsSafari6011211SourceJavaScriptCoreheapSlotVisitorInlinesh">tags/Safari-601.1.21.1/Source/JavaScriptCore/heap/SlotVisitorInlines.h</a></li>
<li><a href="#tagsSafari6011211SourceWTFChangeLog">tags/Safari-601.1.21.1/Source/WTF/ChangeLog</a></li>
<li><a href="#tagsSafari6011211SourceWTFwtfBitmaph">tags/Safari-601.1.21.1/Source/WTF/wtf/Bitmap.h</a></li>
<li><a href="#tagsSafari6011211SourceWTFwtfOwnPtrh">tags/Safari-601.1.21.1/Source/WTF/wtf/OwnPtr.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6011211SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.21.1/Source/JavaScriptCore/ChangeLog (181295 => 181296)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.21.1/Source/JavaScriptCore/ChangeLog        2015-03-09 23:52:38 UTC (rev 181295)
+++ tags/Safari-601.1.21.1/Source/JavaScriptCore/ChangeLog        2015-03-09 23:57:55 UTC (rev 181296)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-06 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for <rdar://problem/20080527>.
+
+ 2015-03-06 Mark Lam <mark.lam@apple.com>
+
+ Workaround for GC hangs due to compiler bug.
+ <rdar://problem/20080527>
+
+ Reviewed by Filip Pizlo.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::visitAggregate):
+ * heap/SlotVisitorInlines.h:
+ (JSC::SlotVisitor::reportExtraMemoryUsage):
+
</ins><span class="cx"> 2015-03-03 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG should constant fold GetScope, and accesses to the scope register in the ByteCodeParser should not pretend that it's a constant as that breaks OSR exit liveness tracking
</span></span></pre></div>
<a id="tagsSafari6011211SourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.21.1/Source/JavaScriptCore/bytecode/CodeBlock.cpp (181295 => 181296)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.21.1/Source/JavaScriptCore/bytecode/CodeBlock.cpp        2015-03-09 23:52:38 UTC (rev 181295)
+++ tags/Safari-601.1.21.1/Source/JavaScriptCore/bytecode/CodeBlock.cpp        2015-03-09 23:57:55 UTC (rev 181296)
</span><span class="lines">@@ -2219,7 +2219,7 @@
</span><span class="cx"> // may proceed past this point - whichever one wins the CAS race.
</span><span class="cx"> unsigned oldValue;
</span><span class="cx"> do {
</span><del>- oldValue = m_visitAggregateHasBeenCalled;
</del><ins>+ oldValue = *const_cast<volatile uint8_t*>(&m_visitAggregateHasBeenCalled);
</ins><span class="cx"> if (oldValue) {
</span><span class="cx"> // Looks like someone else won! Return immediately to ensure that we don't
</span><span class="cx"> // trace the same CodeBlock concurrently. Doing so is hazardous since we will
</span></span></pre></div>
<a id="tagsSafari6011211SourceJavaScriptCoreheapSlotVisitorInlinesh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.21.1/Source/JavaScriptCore/heap/SlotVisitorInlines.h (181295 => 181296)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.21.1/Source/JavaScriptCore/heap/SlotVisitorInlines.h        2015-03-09 23:52:38 UTC (rev 181295)
+++ tags/Safari-601.1.21.1/Source/JavaScriptCore/heap/SlotVisitorInlines.h        2015-03-09 23:57:55 UTC (rev 181296)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(COMPARE_AND_SWAP)
</span><span class="cx"> for (;;) {
</span><del>- size_t oldSize = *counter;
</del><ins>+ size_t oldSize = *const_cast<volatile size_t*>(counter);
</ins><span class="cx"> if (WTF::weakCompareAndSwapSize(counter, oldSize, oldSize + size))
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari6011211SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.21.1/Source/WTF/ChangeLog (181295 => 181296)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.21.1/Source/WTF/ChangeLog        2015-03-09 23:52:38 UTC (rev 181295)
+++ tags/Safari-601.1.21.1/Source/WTF/ChangeLog        2015-03-09 23:57:55 UTC (rev 181296)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-03-06 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for <rdar://problem/20080527>.
+
+ 2015-03-06 Mark Lam <mark.lam@apple.com>
+
+ Workaround for GC hangs due to compiler bug.
+ <rdar://problem/20080527>
+
+ Reviewed by Filip Pizlo.
+
+ * wtf/Bitmap.h:
+ (WTF::WordType>::concurrentTestAndSet):
+ (WTF::WordType>::concurrentTestAndClear):
+ * wtf/OwnPtr.h:
+ (WTF::OwnPtr<T>::createTransactionally):
+
</ins><span class="cx"> 2015-03-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused compression code
</span></span></pre></div>
<a id="tagsSafari6011211SourceWTFwtfBitmaph"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.21.1/Source/WTF/wtf/Bitmap.h (181295 => 181296)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.21.1/Source/WTF/wtf/Bitmap.h        2015-03-09 23:52:38 UTC (rev 181295)
+++ tags/Safari-601.1.21.1/Source/WTF/wtf/Bitmap.h        2015-03-09 23:57:55 UTC (rev 181296)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> WordType* wordPtr = bits.data() + index;
</span><span class="cx"> WordType oldValue;
</span><span class="cx"> do {
</span><del>- oldValue = *wordPtr;
</del><ins>+ oldValue = *const_cast<volatile WordType*>(wordPtr);
</ins><span class="cx"> if (oldValue & mask)
</span><span class="cx"> return true;
</span><span class="cx"> } while (!weakCompareAndSwap(wordPtr, oldValue, oldValue | mask));
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> WordType* wordPtr = bits.data() + index;
</span><span class="cx"> WordType oldValue;
</span><span class="cx"> do {
</span><del>- oldValue = *wordPtr;
</del><ins>+ oldValue = *const_cast<volatile WordType*>(wordPtr);
</ins><span class="cx"> if (!(oldValue & mask))
</span><span class="cx"> return false;
</span><span class="cx"> } while (!weakCompareAndSwap(wordPtr, oldValue, oldValue & ~mask));
</span></span></pre></div>
<a id="tagsSafari6011211SourceWTFwtfOwnPtrh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.21.1/Source/WTF/wtf/OwnPtr.h (181295 => 181296)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.21.1/Source/WTF/wtf/OwnPtr.h        2015-03-09 23:52:38 UTC (rev 181295)
+++ tags/Safari-601.1.21.1/Source/WTF/wtf/OwnPtr.h        2015-03-09 23:57:55 UTC (rev 181296)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> WTF::storeStoreFence();
</span><span class="cx"> #if ENABLE(COMPARE_AND_SWAP)
</span><span class="cx"> do {
</span><del>- if (m_ptr) {
</del><ins>+ if (*bitwise_cast<void*volatile*>(&m_ptr)) {
</ins><span class="cx"> delete newObject;
</span><span class="cx"> WTF::loadLoadFence();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>