Changeset 248729 in webkit

Timestamp:

Aug 15, 2019, 10:49:38 AM (7 years ago)

Author:

rmorisset@apple.com

Message:

[WHLSL] Trivial clean-up of the MSL code generated
​https://bugs.webkit.org/show_bug.cgi?id=200525

Reviewed by Darin Adler.

Emit simpler code for ternary expressions
Remove duplicate {} around functions

No new tests as it is covered by the existing ones.

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

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-15  Robin Morisset  <rmorisset@apple.com>
+
+        [WHLSL] Trivial clean-up of the MSL code generated
+        https://bugs.webkit.org/show_bug.cgi?id=200525
+
+        Reviewed by Darin Adler.
+
+        Emit simpler code for ternary expressions
+        Remove duplicate {} around functions
+
+        No new tests as it is covered by the existing ones.
+
+        * Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp:
+        (WebCore::WHLSL::Metal::FunctionDefinitionWriter::visit):
+
 2019-08-15  Youenn Fablet  <youenn@apple.com>
 

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

@@ -248 +248 @@
             m_stringBuilder.flexibleAppend(m_typeNamer.mangledNameForType(*parameter->type()), ' ', parameterName);
         }
-        m_stringBuilder.append(") {\n");
+        m_stringBuilder.append(")\n");
         checkErrorAndVisit(functionDefinition.block());
         ASSERT(m_stack.isEmpty());
-        m_stringBuilder.append("}\n");
+        m_stringBuilder.append('\n');
     }
 }
@@ -680 +680 @@
     checkErrorAndVisit(ternaryExpression.predicate());
     auto check = takeLastValue();
-
-    auto variableName = generateNextVariableName();
-    m_stringBuilder.flexibleAppend(
-        m_typeNamer.mangledNameForType(ternaryExpression.resolvedType()), ' ', variableName, ";\n"
-        "if (", check, ") {\n"
-    );
     checkErrorAndVisit(ternaryExpression.bodyExpression());
-    m_stringBuilder.flexibleAppend(
-        variableName, " = ", takeLastValue(), ";\n"
-        "} else {\n"
-    );
+    auto body = takeLastValue();
     checkErrorAndVisit(ternaryExpression.elseExpression());
-    m_stringBuilder.flexibleAppend(
-        variableName, " = ", takeLastValue(), ";\n"
-        "}\n"
-    );
+    auto elseBody = takeLastValue();
+
+    auto variableName = generateNextVariableName();
+    m_stringBuilder.flexibleAppend(m_typeNamer.mangledNameForType(ternaryExpression.resolvedType()), ' ', variableName, " = ", check, " ? ", body, " : ", elseBody, ";\n");
     appendRightValue(ternaryExpression, variableName);
 }