<!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>[245745] trunk/Source/WebCore</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/245745">245745</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2019-05-24 01:19:07 -0700 (Fri, 24 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WHLSL] ReadModifyWriteExpression always has a result and new value expression
https://bugs.webkit.org/show_bug.cgi?id=198079

Reviewed by Myles Maxfield.

Let's not pretend it might not.

* Modules/webgpu/WHLSL/AST/WHLSLReadModifyWriteExpression.h:
(WebCore::WHLSL::AST::ReadModifyWriteExpression::newValueExpression):
(WebCore::WHLSL::AST::ReadModifyWriteExpression::resultExpression):
(WebCore::WHLSL::AST::ReadModifyWriteExpression::takeNewValueExpression):
(WebCore::WHLSL::AST::ReadModifyWriteExpression::takeResultExpression):
* Modules/webgpu/WHLSL/WHLSLASTDumper.cpp:
(WebCore::WHLSL::ASTDumper::visit):
* Modules/webgpu/WHLSL/WHLSLChecker.cpp:
(WebCore::WHLSL::Checker::visit):
* Modules/webgpu/WHLSL/WHLSLPropertyResolver.cpp:
(WebCore::WHLSL::PropertyResolver::visit):
* Modules/webgpu/WHLSL/WHLSLVisitor.cpp:
(WebCore::WHLSL::Visitor::visit):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebgpuWHLSLASTWHLSLReadModifyWriteExpressionh">trunk/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLReadModifyWriteExpression.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebgpuWHLSLWHLSLASTDumpercpp">trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLASTDumper.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebgpuWHLSLWHLSLCheckercpp">trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebgpuWHLSLWHLSLPropertyResolvercpp">trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLPropertyResolver.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebgpuWHLSLWHLSLVisitorcpp">trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLVisitor.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (245744 => 245745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-24 07:54:16 UTC (rev 245744)
+++ trunk/Source/WebCore/ChangeLog      2019-05-24 08:19:07 UTC (rev 245745)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2019-05-24  Saam barati  <sbarati@apple.com>
+
+        [WHLSL] ReadModifyWriteExpression always has a result and new value expression
+        https://bugs.webkit.org/show_bug.cgi?id=198079
+
+        Reviewed by Myles Maxfield.
+
+        Let's not pretend it might not.
+
+        * Modules/webgpu/WHLSL/AST/WHLSLReadModifyWriteExpression.h:
+        (WebCore::WHLSL::AST::ReadModifyWriteExpression::newValueExpression):
+        (WebCore::WHLSL::AST::ReadModifyWriteExpression::resultExpression):
+        (WebCore::WHLSL::AST::ReadModifyWriteExpression::takeNewValueExpression):
+        (WebCore::WHLSL::AST::ReadModifyWriteExpression::takeResultExpression):
+        * Modules/webgpu/WHLSL/WHLSLASTDumper.cpp:
+        (WebCore::WHLSL::ASTDumper::visit):
+        * Modules/webgpu/WHLSL/WHLSLChecker.cpp:
+        (WebCore::WHLSL::Checker::visit):
+        * Modules/webgpu/WHLSL/WHLSLPropertyResolver.cpp:
+        (WebCore::WHLSL::PropertyResolver::visit):
+        * Modules/webgpu/WHLSL/WHLSLVisitor.cpp:
+        (WebCore::WHLSL::Visitor::visit):
+
</ins><span class="cx"> 2019-05-23  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         With async overflow scrolling, programmatic scroll to a negative offset fails to clamp the scroll offset
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebgpuWHLSLASTWHLSLReadModifyWriteExpressionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLReadModifyWriteExpression.h (245744 => 245745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLReadModifyWriteExpression.h   2019-05-24 07:54:16 UTC (rev 245744)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLReadModifyWriteExpression.h      2019-05-24 08:19:07 UTC (rev 245745)
</span><span class="lines">@@ -86,13 +86,31 @@
</span><span class="cx">     Expression& leftValue() { return m_leftValue; }
</span><span class="cx">     VariableDeclaration& oldValue() { return m_oldValue; }
</span><span class="cx">     VariableDeclaration& newValue() { return m_newValue; }
</span><del>-    Expression* newValueExpression() { return m_newValueExpression ? &*m_newValueExpression : nullptr; }
-    Expression* resultExpression() { return m_resultExpression ? &*m_resultExpression : nullptr; }
</del><ins>+    Expression& newValueExpression()
+    {
+        ASSERT(m_newValueExpression);
+        return *m_newValueExpression;
+    }
+    Expression& resultExpression()
+    {
+        ASSERT(m_resultExpression);
+        return *m_resultExpression;
+    }
</ins><span class="cx">     UniqueRef<Expression> takeLeftValue() { return WTFMove(m_leftValue); }
</span><span class="cx">     UniqueRef<VariableDeclaration> takeOldValue() { return WTFMove(m_oldValue); }
</span><span class="cx">     UniqueRef<VariableDeclaration> takeNewValue() { return WTFMove(m_newValue); }
</span><del>-    Optional<UniqueRef<Expression>> takeNewValueExpression() { return WTFMove(m_newValueExpression); }
-    Optional<UniqueRef<Expression>> takeResultExpression() { return WTFMove(m_resultExpression); }
</del><ins>+    UniqueRef<Expression> takeNewValueExpression()
+    {
+        auto result = WTFMove(m_newValueExpression.value());
+        m_newValueExpression.reset();
+        return result;
+    }
+    UniqueRef<Expression> takeResultExpression()
+    {
+        auto result = WTFMove(m_resultExpression.value());
+        m_resultExpression.reset();
+        return result;
+    }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     template<class U, class... Args> friend UniqueRef<U> WTF::makeUniqueRef(Args&&...);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebgpuWHLSLWHLSLASTDumpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLASTDumper.cpp (245744 => 245745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLASTDumper.cpp     2019-05-24 07:54:16 UTC (rev 245744)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLASTDumper.cpp        2019-05-24 08:19:07 UTC (rev 245745)
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx"> 
</span><span class="cx">     visit(newVariable.get());
</span><span class="cx">     m_out.print(" = ");
</span><del>-    visit(*readModifyWriteExpression.newValueExpression());
</del><ins>+    visit(readModifyWriteExpression.newValueExpression());
</ins><span class="cx">     m_out.print(", ");
</span><span class="cx"> 
</span><span class="cx">     visit(readModifyWriteExpression.leftValue());
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx">     visit(newVariable.get());
</span><span class="cx">     m_out.print(", ");
</span><span class="cx"> 
</span><del>-    visit(*readModifyWriteExpression.resultExpression());
</del><ins>+    visit(readModifyWriteExpression.resultExpression());
</ins><span class="cx">     m_out.print(")");
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebgpuWHLSLWHLSLCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp (245744 => 245745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp       2019-05-24 07:54:16 UTC (rev 245744)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp  2019-05-24 08:19:07 UTC (rev 245745)
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx"> 
</span><span class="cx">     // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198166 Figure out what to do with the ReadModifyWriteExpression's AnonymousVariables.
</span><span class="cx"> 
</span><del>-    auto newValueInfo = recurseAndGetInfo(*readModifyWriteExpression.newValueExpression());
</del><ins>+    auto newValueInfo = recurseAndGetInfo(readModifyWriteExpression.newValueExpression());
</ins><span class="cx">     if (!newValueInfo)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -856,7 +856,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    auto resultInfo = recurseAndGetInfo(*readModifyWriteExpression.resultExpression());
</del><ins>+    auto resultInfo = recurseAndGetInfo(readModifyWriteExpression.resultExpression());
</ins><span class="cx">     if (!resultInfo)
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebgpuWHLSLWHLSLPropertyResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLPropertyResolver.cpp (245744 => 245745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLPropertyResolver.cpp      2019-05-24 07:54:16 UTC (rev 245744)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLPropertyResolver.cpp 2019-05-24 08:19:07 UTC (rev 245745)
</span><span class="lines">@@ -474,8 +474,7 @@
</span><span class="cx">             variableReference->setTypeAnnotation(AST::LeftValue { AST::AddressSpace::Thread }); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198169 Is this right?
</span><span class="cx"> 
</span><span class="cx">             auto newValueExpression = readModifyWriteExpression.takeNewValueExpression();
</span><del>-            ASSERT(newValueExpression); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198170 Relax this constraint.
-            auto assignmentExpression = makeUniqueRef<AST::AssignmentExpression>(Lexer::Token(readModifyWriteExpression.origin()), WTFMove(variableReference), WTFMove(*newValueExpression));
</del><ins>+            auto assignmentExpression = makeUniqueRef<AST::AssignmentExpression>(Lexer::Token(readModifyWriteExpression.origin()), WTFMove(variableReference), WTFMove(newValueExpression));
</ins><span class="cx">             assignmentExpression->setType(baseType->clone());
</span><span class="cx">             assignmentExpression->setTypeAnnotation(AST::RightValue());
</span><span class="cx"> 
</span><span class="lines">@@ -503,9 +502,8 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         auto resultExpression = readModifyWriteExpression.takeResultExpression();
</span><del>-        ASSERT(resultExpression); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198170 Be resilient to this being null.
-        auto type = (*resultExpression)->resolvedType().clone();
-        expressions.append(WTFMove(*resultExpression));
</del><ins>+        auto type = resultExpression->resolvedType().clone();
+        expressions.append(WTFMove(resultExpression));
</ins><span class="cx"> 
</span><span class="cx">         UniqueRef<AST::VariableDeclaration> oldVariableDeclaration = readModifyWriteExpression.takeOldValue();
</span><span class="cx">         UniqueRef<AST::VariableDeclaration> newVariableDeclaration = readModifyWriteExpression.takeNewValue();
</span><span class="lines">@@ -549,8 +547,7 @@
</span><span class="cx">             variableReference->setTypeAnnotation(AST::LeftValue { AST::AddressSpace::Thread }); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198169 Is this right?
</span><span class="cx"> 
</span><span class="cx">             auto newValueExpression = readModifyWriteExpression.takeNewValueExpression();
</span><del>-            ASSERT(newValueExpression); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198170 Relax this constraint
-            auto assignmentExpression = makeUniqueRef<AST::AssignmentExpression>(Lexer::Token(readModifyWriteExpression.leftValue().origin()), WTFMove(variableReference), WTFMove(*newValueExpression));
</del><ins>+            auto assignmentExpression = makeUniqueRef<AST::AssignmentExpression>(Lexer::Token(readModifyWriteExpression.leftValue().origin()), WTFMove(variableReference), WTFMove(newValueExpression));
</ins><span class="cx">             assignmentExpression->setType(readModifyWriteExpression.leftValue().resolvedType().clone());
</span><span class="cx">             assignmentExpression->setTypeAnnotation(AST::RightValue());
</span><span class="cx"> 
</span><span class="lines">@@ -567,9 +564,8 @@
</span><span class="cx">     simplifyLeftValue(modifyResult->innerLeftValue);
</span><span class="cx"> 
</span><span class="cx">     auto resultExpression = readModifyWriteExpression.takeResultExpression();
</span><del>-    ASSERT(resultExpression); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198170 Be resilient to this being null.
-    auto type = (*resultExpression)->resolvedType().clone();
-    modifyResult->expressions.append(WTFMove(*resultExpression));
</del><ins>+    auto type = resultExpression->resolvedType().clone();
+    modifyResult->expressions.append(WTFMove(resultExpression));
</ins><span class="cx"> 
</span><span class="cx">     UniqueRef<AST::VariableDeclaration> oldVariableDeclaration = readModifyWriteExpression.takeOldValue();
</span><span class="cx">     UniqueRef<AST::VariableDeclaration> newVariableDeclaration = readModifyWriteExpression.takeNewValue();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebgpuWHLSLWHLSLVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLVisitor.cpp (245744 => 245745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLVisitor.cpp       2019-05-24 07:54:16 UTC (rev 245744)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLVisitor.cpp  2019-05-24 08:19:07 UTC (rev 245745)
</span><span class="lines">@@ -536,10 +536,8 @@
</span><span class="cx">     checkErrorAndVisit(readModifyWriteExpression.leftValue());
</span><span class="cx">     checkErrorAndVisit(readModifyWriteExpression.oldValue());
</span><span class="cx">     checkErrorAndVisit(readModifyWriteExpression.newValue());
</span><del>-    if (readModifyWriteExpression.newValueExpression())
-        checkErrorAndVisit(*readModifyWriteExpression.newValueExpression());
-    if (readModifyWriteExpression.resultExpression())
-        checkErrorAndVisit(*readModifyWriteExpression.resultExpression());
</del><ins>+    checkErrorAndVisit(readModifyWriteExpression.newValueExpression());
+    checkErrorAndVisit(readModifyWriteExpression.resultExpression());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Visitor::visit(AST::TernaryExpression& ternaryExpression)
</span></span></pre>
</div>
</div>

</body>
</html>