<!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>[245404] branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler</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/245404">245404</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2019-05-16 12:33:40 -0700 (Thu, 16 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Apply patch. rdar://problem/50754976</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607212branchSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#branchessafari607212branchSourceJavaScriptCorebytecompilerBytecodeGeneratorh">branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607212branchSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (245403 => 245404)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2019-05-16 19:22:47 UTC (rev 245403)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp   2019-05-16 19:33:40 UTC (rev 245404)
</span><span class="lines">@@ -1708,8 +1708,7 @@
</span><span class="cx">     return srcDst;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template<typename EqOp>
-RegisterID* BytecodeGenerator::emitEqualityOp(RegisterID* dst, RegisterID* src1, RegisterID* src2)
</del><ins>+bool BytecodeGenerator::emitEqualityOpImpl(RegisterID* dst, RegisterID* src1, RegisterID* src2)
</ins><span class="cx"> {
</span><span class="cx">     if (!canDoPeepholeOptimization())
</span><span class="cx">         return false;
</span><span class="lines">@@ -1724,48 +1723,47 @@
</span><span class="cx">             if (value == "undefined") {
</span><span class="cx">                 rewind();
</span><span class="cx">                 OpIsUndefined::emit(this, dst, op.m_value);
</span><del>-                return dst;
</del><ins>+                return true;
</ins><span class="cx">             }
</span><span class="cx">             if (value == "boolean") {
</span><span class="cx">                 rewind();
</span><span class="cx">                 OpIsBoolean::emit(this, dst, op.m_value);
</span><del>-                return dst;
</del><ins>+                return true;
</ins><span class="cx">             }
</span><span class="cx">             if (value == "number") {
</span><span class="cx">                 rewind();
</span><span class="cx">                 OpIsNumber::emit(this, dst, op.m_value);
</span><del>-                return dst;
</del><ins>+                return true;
</ins><span class="cx">             }
</span><span class="cx">             if (value == "string") {
</span><span class="cx">                 rewind();
</span><span class="cx">                 OpIsCellWithType::emit(this, dst, op.m_value, StringType);
</span><del>-                return dst;
</del><ins>+                return true;
</ins><span class="cx">             }
</span><span class="cx">             if (value == "symbol") {
</span><span class="cx">                 rewind();
</span><span class="cx">                 OpIsCellWithType::emit(this, dst, op.m_value, SymbolType);
</span><del>-                return dst;
</del><ins>+                return true;
</ins><span class="cx">             }
</span><span class="cx">             if (Options::useBigInt() && value == "bigint") {
</span><span class="cx">                 rewind();
</span><span class="cx">                 OpIsCellWithType::emit(this, dst, op.m_value, BigIntType);
</span><del>-                return dst;
</del><ins>+                return true;
</ins><span class="cx">             }
</span><span class="cx">             if (value == "object") {
</span><span class="cx">                 rewind();
</span><span class="cx">                 OpIsObjectOrNull::emit(this, dst, op.m_value);
</span><del>-                return dst;
</del><ins>+                return true;
</ins><span class="cx">             }
</span><span class="cx">             if (value == "function") {
</span><span class="cx">                 rewind();
</span><span class="cx">                 OpIsFunction::emit(this, dst, op.m_value);
</span><del>-                return dst;
</del><ins>+                return true;
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    EqOp::emit(this, dst, src1, src2);
-    return dst;
</del><ins>+    return false;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void BytecodeGenerator::emitTypeProfilerExpressionInfo(const JSTextPosition& startDivot, const JSTextPosition& endDivot)
</span></span></pre></div>
<a id="branchessafari607212branchSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (245403 => 245404)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h  2019-05-16 19:22:47 UTC (rev 245403)
+++ branches/safari-607.2.1.2-branch/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h     2019-05-16 19:33:40 UTC (rev 245404)
</span><span class="lines">@@ -711,7 +711,15 @@
</span><span class="cx">         RegisterID* emitBinaryOp(OpcodeID, RegisterID* dst, RegisterID* src1, RegisterID* src2, OperandTypes);
</span><span class="cx"> 
</span><span class="cx">         template<typename EqOp>
</span><del>-        RegisterID* emitEqualityOp(RegisterID* dst, RegisterID* src1, RegisterID* src2);
</del><ins>+        RegisterID* emitEqualityOp(RegisterID* dst, RegisterID* src1, RegisterID* src2)
+        {
+            if (!emitEqualityOpImpl(dst, src1, src2))
+                EqOp::emit(this, dst, src1, src2);
+            return dst;
+        }
+
+        bool emitEqualityOpImpl(RegisterID* dst, RegisterID* src1, RegisterID* src2);
+
</ins><span class="cx">         RegisterID* emitCreateThis(RegisterID* dst);
</span><span class="cx">         void emitTDZCheck(RegisterID* target);
</span><span class="cx">         bool needsTDZCheck(const Variable&);
</span></span></pre>
</div>
</div>

</body>
</html>