<!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>[265946] branches/safari-610.1.28.2-branch/Source/JavaScriptCore</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/265946">265946</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2020-08-20 09:32:17 -0700 (Thu, 20 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert <a href="http://trac.webkit.org/projects/webkit/changeset/265929">r265929</a>. rdar://problem/67439277</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6101282branchSourceJavaScriptCoreChangeLog">branches/safari-610.1.28.2-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6101282branchSourceJavaScriptCoreb3B3ReduceStrengthcpp">branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/B3ReduceStrength.cpp</a></li>
<li><a href="#branchessafari6101282branchSourceJavaScriptCoreb3testb3h">branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3.h</a></li>
<li><a href="#branchessafari6101282branchSourceJavaScriptCoreb3testb3_1cpp">branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3_1.cpp</a></li>
<li><a href="#branchessafari6101282branchSourceJavaScriptCoreb3testb3_5cpp">branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3_5.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6101282branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.28.2-branch/Source/JavaScriptCore/ChangeLog (265945 => 265946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.28.2-branch/Source/JavaScriptCore/ChangeLog        2020-08-20 16:28:29 UTC (rev 265945)
+++ branches/safari-610.1.28.2-branch/Source/JavaScriptCore/ChangeLog   2020-08-20 16:32:17 UTC (rev 265946)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2020-08-20  Alan Coon  <alancoon@apple.com>
+
+        Revert r265891. rdar://problem/67439277
+
</ins><span class="cx"> 2020-08-19  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r265891. rdar://problem/67439277
</span></span></pre></div>
<a id="branchessafari6101282branchSourceJavaScriptCoreb3B3ReduceStrengthcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/B3ReduceStrength.cpp (265945 => 265946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/B3ReduceStrength.cpp  2020-08-20 16:28:29 UTC (rev 265945)
+++ branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/B3ReduceStrength.cpp     2020-08-20 16:32:17 UTC (rev 265946)
</span><span class="lines">@@ -123,8 +123,6 @@
</span><span class="cx">     {
</span><span class="cx">         if (!(mask + 1))
</span><span class="cx">             return top<T>();
</span><del>-        if (mask < 0)
-            return IntRange(INT_MIN & mask, mask & INT_MAX);
</del><span class="cx">         return IntRange(0, mask);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6101282branchSourceJavaScriptCoreb3testb3h"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3.h (265945 => 265946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3.h      2020-08-20 16:28:29 UTC (rev 265945)
+++ branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3.h 2020-08-20 16:32:17 UTC (rev 265946)
</span><span class="lines">@@ -804,7 +804,6 @@
</span><span class="cx"> void testCheckSubImm();
</span><span class="cx"> void testCheckSubBadImm();
</span><span class="cx"> void testCheckSub();
</span><del>-void testCheckSubBitAnd();
</del><span class="cx"> double doubleSub(double, double);
</span><span class="cx"> void testCheckSub64();
</span><span class="cx"> void testCheckSubFold(int, int);
</span></span></pre></div>
<a id="branchessafari6101282branchSourceJavaScriptCoreb3testb3_1cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3_1.cpp (265945 => 265946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3_1.cpp  2020-08-20 16:28:29 UTC (rev 265945)
+++ branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3_1.cpp     2020-08-20 16:32:17 UTC (rev 265946)
</span><span class="lines">@@ -496,7 +496,6 @@
</span><span class="cx">     RUN(testCheckSubImm());
</span><span class="cx">     RUN(testCheckSubBadImm());
</span><span class="cx">     RUN(testCheckSub());
</span><del>-    RUN(testCheckSubBitAnd());
</del><span class="cx">     RUN(testCheckSub64());
</span><span class="cx">     RUN(testCheckSubFold(100, 200));
</span><span class="cx">     RUN(testCheckSubFoldFail(-2147483647, 100));
</span></span></pre></div>
<a id="branchessafari6101282branchSourceJavaScriptCoreb3testb3_5cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3_5.cpp (265945 => 265946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3_5.cpp  2020-08-20 16:28:29 UTC (rev 265945)
+++ branches/safari-610.1.28.2-branch/Source/JavaScriptCore/b3/testb3_5.cpp     2020-08-20 16:32:17 UTC (rev 265946)
</span><span class="lines">@@ -1125,38 +1125,6 @@
</span><span class="cx">     CHECK(invoke<double>(*code, -2147483647, 42) == -2147483689.0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void testCheckSubBitAnd()
-{
-    Procedure proc;
-    if (proc.optLevel() < 1)
-        return;
-    BasicBlock* root = proc.addBlock();
-    Value* zero = root->appendNew<Const32Value>(proc, Origin(), 0);
-    Value* arg1 = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
-    Value* truncatedArg1 = root->appendNew<Value>(proc, Trunc, Origin(), arg1);
-    Value* minusTwo = root->appendNew<Const32Value>(proc, Origin(), -2);
-    Value* bitAnd = root->appendNew<Value>(proc, BitAnd, Origin(), truncatedArg1, minusTwo);
-    CheckValue* checkSub = root->appendNew<CheckValue>(proc, CheckSub, Origin(), zero, bitAnd);
-    checkSub->setGenerator([&] (CCallHelpers& jit, const StackmapGenerationParams&) {
-        AllowMacroScratchRegisterUsage allowScratch(jit);
-        jit.move(CCallHelpers::TrustedImm32(42), GPRInfo::returnValueGPR);
-        jit.emitFunctionEpilogue();
-        jit.ret();
-    });
-    root->appendNewControlValue(proc, Return, Origin(), checkSub);
-
-    auto code = compileProc(proc);
-
-    CHECK_EQ(invoke<int>(*code, 1), 0);
-    CHECK_EQ(invoke<int>(*code, 2), -2);
-    CHECK_EQ(invoke<int>(*code, 3), -2);
-    CHECK_EQ(invoke<int>(*code, -1), 2);
-    CHECK_EQ(invoke<int>(*code, -2), 2);
-    CHECK_EQ(invoke<int>(*code, -3), 4);
-    CHECK_EQ(invoke<int>(*code, INT_MAX), -(INT_MAX - 1));
-    CHECK_EQ(invoke<int>(*code, INT_MIN), 42);
-}
-
</del><span class="cx"> NEVER_INLINE double doubleSub(double a, double b)
</span><span class="cx"> {
</span><span class="cx">     return a - b;
</span></span></pre>
</div>
</div>

</body>
</html>