<!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>[205174] tags/Safari-603.1.3.0.1</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/205174">205174</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-08-29 23:10:18 -0700 (Mon, 29 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/204901">r204901</a>. rdar://problem/28062188</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6031301LayoutTestsChangeLog">tags/Safari-603.1.3.0.1/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari6031301LayoutTestsTestExpectations">tags/Safari-603.1.3.0.1/LayoutTests/TestExpectations</a></li>
<li><a href="#tagsSafari6031301SourceJavaScriptCoreChangeLog">tags/Safari-603.1.3.0.1/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari6031301SourceJavaScriptCorebytecodeObjectAllocationProfileh">tags/Safari-603.1.3.0.1/Source/JavaScriptCore/bytecode/ObjectAllocationProfile.h</a></li>
<li><a href="#tagsSafari6031301SourceJavaScriptCorejitJITOperationscpp">tags/Safari-603.1.3.0.1/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6031301LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3.0.1/LayoutTests/ChangeLog (205173 => 205174)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3.0.1/LayoutTests/ChangeLog 2016-08-30 06:07:44 UTC (rev 205173)
+++ tags/Safari-603.1.3.0.1/LayoutTests/ChangeLog 2016-08-30 06:10:18 UTC (rev 205174)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-29 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204901.
+
+ 2016-08-23 Filip Pizlo <fpizlo@apple.com>
+
+ js/regress/put-by-id-transition-with-indexing-header.html and svg/carto.net/window.svg fail in debug after r204854
+ https://bugs.webkit.org/show_bug.cgi?id=161115
+
+ Reviewed by Keith Miller.
+
+ * TestExpectations:
+
</ins><span class="cx"> 2016-08-25 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r204986.
</span></span></pre></div>
<a id="tagsSafari6031301LayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3.0.1/LayoutTests/TestExpectations (205173 => 205174)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3.0.1/LayoutTests/TestExpectations 2016-08-30 06:07:44 UTC (rev 205173)
+++ tags/Safari-603.1.3.0.1/LayoutTests/TestExpectations 2016-08-30 06:10:18 UTC (rev 205174)
</span><span class="lines">@@ -1234,4 +1234,3 @@
</span><span class="cx"> webkit.org/b/159755 fast/text/emoji-gender-fe0f-9.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/159755 fast/text/emoji-gender.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><del>-[Debug] webkit.org/b/161114 svg/carto.net/window.svg [ Skip ]
</del></span></pre></div>
<a id="tagsSafari6031301SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3.0.1/Source/JavaScriptCore/ChangeLog (205173 => 205174)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3.0.1/Source/JavaScriptCore/ChangeLog 2016-08-30 06:07:44 UTC (rev 205173)
+++ tags/Safari-603.1.3.0.1/Source/JavaScriptCore/ChangeLog 2016-08-30 06:10:18 UTC (rev 205174)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-08-29 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204901.
+
+ 2016-08-23 Filip Pizlo <fpizlo@apple.com>
+
+ js/regress/put-by-id-transition-with-indexing-header.html and svg/carto.net/window.svg fail in debug after r204854
+ https://bugs.webkit.org/show_bug.cgi?id=161115
+
+ Reviewed by Keith Miller.
+
+ There were two small goofs.
+
+ * bytecode/ObjectAllocationProfile.h:
+ (JSC::ObjectAllocationProfile::isNull): The new policy is that the allocator can be null. So now the way you tell if the profile is null is by checking the structure.
+ * jit/JITOperations.cpp: This was using DeferGC, which is now definitely wrong. It forces the GC to happen when the structure and butterfly are mismatched. It's better for the GC to happen before we put the butterfly in the object.
+
+2016-08-29 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r204897.
</span><span class="cx">
</span><span class="cx"> 2016-08-24 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="tagsSafari6031301SourceJavaScriptCorebytecodeObjectAllocationProfileh"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3.0.1/Source/JavaScriptCore/bytecode/ObjectAllocationProfile.h (205173 => 205174)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3.0.1/Source/JavaScriptCore/bytecode/ObjectAllocationProfile.h 2016-08-30 06:07:44 UTC (rev 205173)
+++ tags/Safari-603.1.3.0.1/Source/JavaScriptCore/bytecode/ObjectAllocationProfile.h 2016-08-30 06:10:18 UTC (rev 205174)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isNull() { return !m_allocator; }
</del><ins>+ bool isNull() { return !m_structure; }
</ins><span class="cx">
</span><span class="cx"> void initialize(VM& vm, JSCell* owner, JSObject* prototype, unsigned inferredInlineCapacity)
</span><span class="cx"> {
</span></span></pre></div>
<a id="tagsSafari6031301SourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3.0.1/Source/JavaScriptCore/jit/JITOperations.cpp (205173 => 205174)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3.0.1/Source/JavaScriptCore/jit/JITOperations.cpp 2016-08-30 06:07:44 UTC (rev 205173)
+++ tags/Safari-603.1.3.0.1/Source/JavaScriptCore/jit/JITOperations.cpp 2016-08-30 06:10:18 UTC (rev 205174)
</span><span class="lines">@@ -2119,7 +2119,6 @@
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="cx">
</span><span class="cx"> ASSERT(!object->structure()->outOfLineCapacity());
</span><del>- DeferGC deferGC(vm.heap);
</del><span class="cx"> Butterfly* result = object->growOutOfLineStorage(vm, 0, initialOutOfLineCapacity);
</span><span class="cx"> object->setButterflyWithoutChangingStructure(vm, result);
</span><span class="cx"> return reinterpret_cast<char*>(result);
</span><span class="lines">@@ -2130,7 +2129,6 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="cx">
</span><del>- DeferGC deferGC(vm.heap);
</del><span class="cx"> Butterfly* result = object->growOutOfLineStorage(vm, object->structure()->outOfLineCapacity(), newSize);
</span><span class="cx"> object->setButterflyWithoutChangingStructure(vm, result);
</span><span class="cx"> return reinterpret_cast<char*>(result);
</span></span></pre>
</div>
</div>
</body>
</html>