<!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>[152538] branches/dfgFourthTier</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/152538">152538</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2013-07-10 10:02:26 -0700 (Wed, 10 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged from http://svn.webkit.org/repository/webkit/trunk
------------------------------------------------------------------------
<a href="http://trac.webkit.org/projects/webkit/changeset/146831">r146831</a> | mark.lam@apple.com | 2013-03-25 17:36:18 -0700 (Mon, 25 Mar 2013) | 19 lines

Offlineasm cloop backend compiles op+branch incorrectly.
https://bugs.webkit.org/show_bug.cgi?id=113146.

* dfg/DFGRepatch.h:
(JSC::DFG::dfgResetGetByID):
(JSC::DFG::dfgResetPutByID):
* llint/LLIntOfflineAsmConfig.h:
* offlineasm/cloop.rb:
------------------------------------------------------------------------</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreChangeLog">branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoredfgDFGRepatchh">branches/dfgFourthTier/Source/JavaScriptCore/dfg/DFGRepatch.h</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCorellintLLIntOfflineAsmConfigh">branches/dfgFourthTier/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreofflineasmclooprb">branches/dfgFourthTier/Source/JavaScriptCore/offlineasm/cloop.rb</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branchesdfgFourthTier">branches/dfgFourthTier/</a></li>
<li><a href="#branchesdfgFourthTierSource">branches/dfgFourthTier/Source/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesdfgFourthTier"></a>
<div class="propset"><h4>Property changes: branches/dfgFourthTier</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">   + /trunk:53455,146505,146552,146831*,147670,147690,147798,147858,148119,148639,148641,148655,148709,148720,148746,148820,148893,148899,148942,148989,149089,149205,149404,149420,150160,150449
</span><a id="branchesdfgFourthTierSource"></a>
<div class="propset"><h4>Property changes: branches/dfgFourthTier/Source</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog (152537 => 152538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog        2013-07-10 16:20:24 UTC (rev 152537)
+++ branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog        2013-07-10 17:02:26 UTC (rev 152538)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-07-10  Mark Lam  &lt;mark.lam@apple.com&gt;
+
+        Merged from http://svn.webkit.org/repository/webkit/trunk
+        ------------------------------------------------------------------------
+        r146831 | mark.lam@apple.com | 2013-03-25 17:36:18 -0700 (Mon, 25 Mar 2013) | 19 lines
+
+        Offlineasm cloop backend compiles op+branch incorrectly.
+        https://bugs.webkit.org/show_bug.cgi?id=113146.
+
+        * dfg/DFGRepatch.h:
+        (JSC::DFG::dfgResetGetByID):
+        (JSC::DFG::dfgResetPutByID):
+        * llint/LLIntOfflineAsmConfig.h:
+        * offlineasm/cloop.rb:
+        ------------------------------------------------------------------------
+
</ins><span class="cx"> 2013-07-08  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         NaturalLoops + Profiler = Crash
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoredfgDFGRepatchh"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/dfg/DFGRepatch.h (152537 => 152538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/dfg/DFGRepatch.h        2013-07-10 16:20:24 UTC (rev 152537)
+++ branches/dfgFourthTier/Source/JavaScriptCore/dfg/DFGRepatch.h        2013-07-10 17:02:26 UTC (rev 152538)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> 
</span><span class="cx"> namespace DFG {
</span><span class="cx"> 
</span><del>-inline NO_RETURN_DUE_TO_CRASH void dfgResetGetByID(RepatchBuffer&amp;, StructureStubInfo&amp;) { RELEASE_ASSERT_NOT_REACHED(); }
-inline NO_RETURN_DUE_TO_CRASH void dfgResetPutByID(RepatchBuffer&amp;, StructureStubInfo&amp;) { RELEASE_ASSERT_NOT_REACHED(); }
</del><ins>+inline NO_RETURN void dfgResetGetByID(RepatchBuffer&amp;, StructureStubInfo&amp;) { RELEASE_ASSERT_NOT_REACHED(); }
+inline NO_RETURN void dfgResetPutByID(RepatchBuffer&amp;, StructureStubInfo&amp;) { RELEASE_ASSERT_NOT_REACHED(); }
</ins><span class="cx"> inline NO_RETURN void dfgResetIn(RepatchBuffer&amp;, StructureStubInfo&amp;) { RELEASE_ASSERT_NOT_REACHED(); }
</span><span class="cx"> 
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCorellintLLIntOfflineAsmConfigh"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h (152537 => 152538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h        2013-07-10 16:20:24 UTC (rev 152537)
+++ branches/dfgFourthTier/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h        2013-07-10 17:02:26 UTC (rev 152538)
</span><span class="lines">@@ -35,7 +35,9 @@
</span><span class="cx"> #if ENABLE(LLINT_C_LOOP)
</span><span class="cx"> #define OFFLINE_ASM_C_LOOP 1
</span><span class="cx"> #define OFFLINE_ASM_X86 0
</span><ins>+#define OFFLINE_ASM_ARM 0
</ins><span class="cx"> #define OFFLINE_ASM_ARMv7 0
</span><ins>+#define OFFLINE_ASM_ARMv7_TRADITIONAL 0
</ins><span class="cx"> #define OFFLINE_ASM_X86_64 0
</span><span class="cx"> #define OFFLINE_ASM_ARMv7s 0
</span><span class="cx"> #define OFFLINE_ASM_MIPS 0
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCoreofflineasmclooprb"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/offlineasm/cloop.rb (152537 => 152538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/offlineasm/cloop.rb        2013-07-10 16:20:24 UTC (rev 152537)
+++ branches/dfgFourthTier/Source/JavaScriptCore/offlineasm/cloop.rb        2013-07-10 17:02:26 UTC (rev 152538)
</span><span class="lines">@@ -465,9 +465,9 @@
</span><span class="cx"> 
</span><span class="cx">     $asm.putc &quot;{&quot;
</span><span class="cx">     $asm.putc &quot;    #{tempType} temp = #{op2} #{operator} #{op1};&quot;
</span><ins>+    $asm.putc &quot;    #{op2} = temp;&quot;
</ins><span class="cx">     $asm.putc &quot;    if (temp #{conditionTest})&quot;
</span><span class="cx">     $asm.putc &quot;        goto  #{operands[2].cLabel};&quot;
</span><del>-    $asm.putc &quot;    #{op2} = temp;&quot;
</del><span class="cx">     $asm.putc &quot;}&quot;
</span><span class="cx"> end
</span><span class="cx"> 
</span><span class="lines">@@ -533,10 +533,10 @@
</span><span class="cx">         raise &quot;Unimplemented opeartor&quot;
</span><span class="cx">     end
</span><span class="cx"> 
</span><del>-    $asm.putc &quot;    if #{overflowTest} {&quot;
</del><ins>+    $asm.putc &quot;    bool didOverflow = #{overflowTest};&quot;
+    $asm.putc &quot;    #{operands[1].clValue(type)} = #{operands[1].clValue(type)} #{operator} #{operands[0].clValue(type)};&quot;
+    $asm.putc &quot;    if (didOverflow)&quot;
</ins><span class="cx">     $asm.putc &quot;        goto #{operands[2].cLabel};&quot;
</span><del>-    $asm.putc &quot;    }&quot;
-    $asm.putc &quot;    #{operands[1].clValue(type)} = #{operands[1].clValue(type)} #{operator} #{operands[0].clValue(type)};&quot;
</del><span class="cx">     $asm.putc &quot;}&quot;
</span><span class="cx"> end
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>