Changeset 248706 in webkit

Timestamp:

Aug 14, 2019 8:36:22 PM (5 years ago)

Author:

mmaxfield@apple.com

Message:

[WHLSL] Variables shouldn't be able to have void type
​https://bugs.webkit.org/show_bug.cgi?id=200751

Reviewed by Robin Morisset.

Source/WebCore:

Trivial fix. Found by ​https://github.com/gpuweb/WHLSL/issues/320.

Test: webgpu/whlsl/void-variable-parameter.html

• Modules/webgpu/WHLSL/WHLSLChecker.cpp:

(WebCore::WHLSL::Checker::visit):

LayoutTests:

• webgpu/whlsl/void-variable-parameter-expected.txt: Added.
• webgpu/whlsl/void-variable-parameter.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgpu/whlsl/void-variable-parameter-expected.txt (added)
• LayoutTests/webgpu/whlsl/void-variable-parameter.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-14  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WHLSL] Variables shouldn't be able to have void type
+        https://bugs.webkit.org/show_bug.cgi?id=200751
+
+        Reviewed by Robin Morisset.
+
+        * webgpu/whlsl/void-variable-parameter-expected.txt: Added.
+        * webgpu/whlsl/void-variable-parameter.html: Added.
+
 2019-08-14  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-14  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WHLSL] Variables shouldn't be able to have void type
+        https://bugs.webkit.org/show_bug.cgi?id=200751
+
+        Reviewed by Robin Morisset.
+
+        Trivial fix. Found by https://github.com/gpuweb/WHLSL/issues/320.
+
+        Test: webgpu/whlsl/void-variable-parameter.html
+
+        * Modules/webgpu/WHLSL/WHLSLChecker.cpp:
+        (WebCore::WHLSL::Checker::visit):
+
 2019-08-14  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp

@@ -953 +953 @@
     // and that doesn't recurse on the anonymous variables, so we can assume the variable has a type.
     checkErrorAndVisit(*variableDeclaration.type());
+    if (matches(*variableDeclaration.type(), m_intrinsics.voidType())) {
+        setError(Error("Variables can't have void type.", variableDeclaration.codeLocation()));
+        return;
+    }
     if (variableDeclaration.initializer()) {
         auto& lhsType = *variableDeclaration.type();