Changeset 245973 in webkit

Timestamp:

May 31, 2019, 11:16:45 AM (7 years ago)

Author:

sbarati@apple.com

Message:

[WHLSL] Make sure we properly emit code for "&*x"
​https://bugs.webkit.org/show_bug.cgi?id=198198

Reviewed by Myles C. Maxfield.

Source/WebCore:

I ran into this when trying to test zero-filling code, so let's just fix it.
The issue is that the property resolver ends up emitting code that looks like
"&*x". The semantics of this are such that it should result in just x.
However, we emitted Metal code in such a way where we'd end up with a pointer
to a temporary value. To fix this, DereferenceExpression will emit code that results
in a reference type. Then, MakePointerExpression will correctly return the
pointer backing that reference type.

Because of this, we also no longer need to pattern match the lhs of assignment
expressions since we will now be assigning to a reference type.

Test: webgpu/whlsl-store-to-property-updates-properly.html

• Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp:

(WebCore::WHLSL::Metal::FunctionDefinitionWriter::visit):

LayoutTests:

• webgpu/whlsl-store-to-property-updates-properly-expected.html: Added.
• webgpu/whlsl-store-to-property-updates-properly.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgpu/whlsl-store-to-property-updates-properly-expected.html (added)
• LayoutTests/webgpu/whlsl-store-to-property-updates-properly.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-31  Saam Barati  <sbarati@apple.com>
+
+        [WHLSL] Make sure we properly emit code for "&*x"
+        https://bugs.webkit.org/show_bug.cgi?id=198198
+
+        Reviewed by Myles C. Maxfield.
+
+        * webgpu/whlsl-store-to-property-updates-properly-expected.html: Added.
+        * webgpu/whlsl-store-to-property-updates-properly.html: Added.
+
 2019-05-31  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-31  Saam Barati  <sbarati@apple.com>
+
+        [WHLSL] Make sure we properly emit code for "&*x"
+        https://bugs.webkit.org/show_bug.cgi?id=198198
+
+        Reviewed by Myles C. Maxfield.
+
+        I ran into this when trying to test zero-filling code, so let's just fix it.
+        The issue is that the property resolver ends up emitting code that looks like
+        "&*x". The semantics of this are such that it should result in just x.
+        However, we emitted Metal code in such a way where we'd end up with a pointer
+        to a temporary value. To fix this, DereferenceExpression will emit code that results
+        in a reference type. Then, MakePointerExpression will correctly return the
+        pointer backing that reference type.
+        
+        Because of this, we also no longer need to pattern match the lhs of assignment
+        expressions since we will now be assigning to a reference type.
+
+        Test: webgpu/whlsl-store-to-property-updates-properly.html
+
+        * Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp:
+        (WebCore::WHLSL::Metal::FunctionDefinitionWriter::visit):
+
 2019-05-31  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp

@@ -458 +458 @@
 void FunctionDefinitionWriter::visit(AST::AssignmentExpression& assignmentExpression)
 {
-    if (is<AST::DereferenceExpression>(assignmentExpression.left())) {
-        checkErrorAndVisit(downcast<AST::DereferenceExpression>(assignmentExpression.left()).pointer());
-        auto leftName = m_stack.takeLast();
-        checkErrorAndVisit(assignmentExpression.right());
-        auto rightName = m_stack.takeLast();
-        m_stringBuilder.append(makeString('*', leftName, " = ", rightName, ";\n"));
-        m_stack.append(rightName);
-        return;
-    }
     checkErrorAndVisit(assignmentExpression.left());
     auto leftName = m_stack.takeLast();
@@ -511 +502 @@
     auto right = m_stack.takeLast();
     auto variableName = generateNextVariableName();
-    m_stringBuilder.append(makeString(m_typeNamer.mangledNameForType(dereferenceExpression.resolvedType()), ' ', variableName, " = *", right, ";\n"));
+    m_stringBuilder.append(makeString(AST::toString(*dereferenceExpression.typeAnnotation().leftAddressSpace()), ' ', m_typeNamer.mangledNameForType(dereferenceExpression.resolvedType()), "& ", variableName, " = *", right, ";\n"));
     m_stack.append(variableName);
 }