Changeset 247675 in webkit

Timestamp:

Jul 21, 2019 11:31:53 AM (5 years ago)

Author:

sbarati@apple.com

Message:

[WHLSL] Return the zero-value enum in the enum-from-integer constructor when the integer is not a valid enum value
​https://bugs.webkit.org/show_bug.cgi?id=199853

Reviewed by Dean Jackson.

Source/WebCore:

Test: webgpu/whlsl/enum-integer-constructor.html

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

(WebCore::WHLSL::Metal::writeNativeFunction):

LayoutTests:

• webgpu/whlsl/enum-integer-constructor-expected.txt: Added.
• webgpu/whlsl/enum-integer-constructor.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgpu/whlsl/enum-integer-constructor-expected.txt (added)
• LayoutTests/webgpu/whlsl/enum-integer-constructor.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLNativeFunctionWriter.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-21  Saam Barati  <sbarati@apple.com>
+
+        [WHLSL] Return the zero-value enum in the enum-from-integer constructor when the integer is not a valid enum value
+        https://bugs.webkit.org/show_bug.cgi?id=199853
+
+        Reviewed by Dean Jackson.
+
+        * webgpu/whlsl/enum-integer-constructor-expected.txt: Added.
+        * webgpu/whlsl/enum-integer-constructor.html: Added.
+
 2019-07-21  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-21  Saam Barati  <sbarati@apple.com>
+
+        [WHLSL] Return the zero-value enum in the enum-from-integer constructor when the integer is not a valid enum value
+        https://bugs.webkit.org/show_bug.cgi?id=199853
+
+        Reviewed by Dean Jackson.
+
+        Test: webgpu/whlsl/enum-integer-constructor.html
+
+        * Modules/webgpu/WHLSL/Metal/WHLSLNativeFunctionWriter.cpp:
+        (WebCore::WHLSL::Metal::writeNativeFunction):
+
 2019-07-21  Myles C. Maxfield  <mmaxfield@apple.com>
 

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

@@ -32 +32 @@
 #include "WHLSLAddressSpace.h"
 #include "WHLSLArrayType.h"
+#include "WHLSLEnumerationDefinition.h"
 #include "WHLSLInferTypes.h"
 #include "WHLSLIntrinsics.h"
@@ -124 +125 @@
     StringBuilder stringBuilder;
     if (nativeFunctionDeclaration.isCast()) {
-        auto metalReturnName = typeNamer.mangledNameForType(nativeFunctionDeclaration.type());
+        auto& returnType = nativeFunctionDeclaration.type();
+        auto metalReturnName = typeNamer.mangledNameForType(returnType);
         if (!nativeFunctionDeclaration.parameters().size()) {
             stringBuilder.append(makeString(metalReturnName, ' ', outputFunctionName, "() {\n"));
@@ -135 +137 @@
 
         ASSERT(nativeFunctionDeclaration.parameters().size() == 1);
-        auto metalParameterName = typeNamer.mangledNameForType(*nativeFunctionDeclaration.parameters()[0]->type());
+        auto& parameterType = *nativeFunctionDeclaration.parameters()[0]->type();
+        auto metalParameterName = typeNamer.mangledNameForType(parameterType);
         stringBuilder.append(makeString(metalReturnName, ' ', outputFunctionName, '(', metalParameterName, " x) {\n"));
+
+        {
+            auto isEnumerationDefinition = [] (auto& type) {
+                return is<AST::NamedType>(type) && is<AST::EnumerationDefinition>(downcast<AST::NamedType>(type));
+            };
+            auto& unifiedReturnType = returnType.unifyNode();
+            if (isEnumerationDefinition(unifiedReturnType) && !isEnumerationDefinition(parameterType.unifyNode())) { 
+                auto& enumerationDefinition = downcast<AST::EnumerationDefinition>(downcast<AST::NamedType>(unifiedReturnType));
+                stringBuilder.append("    switch (x) {\n");
+                bool hasZeroCase = false;
+                for (auto& member : enumerationDefinition.enumerationMembers()) {
+                    hasZeroCase |= !member.get().value();
+                    stringBuilder.append(makeString("        case ", member.get().value(), ": break;\n"));
+                }
+                ASSERT_UNUSED(hasZeroCase, hasZeroCase);
+                stringBuilder.append("        default: x = 0; break; }\n");
+            }
+        }
+
         stringBuilder.append(makeString("    return static_cast<", metalReturnName, ">(x);\n"));
         stringBuilder.append("}\n");