Changeset 248746 in webkit

Timestamp:

Aug 15, 2019, 2:18:11 PM (7 years ago)

Author:

rmorisset@apple.com

Message:

[WHLSL] Don't accept operator&& or operator

in the Lexer

​https://bugs.webkit.org/show_bug.cgi?id=200785

Reviewed by Saam Barati.

Source/WebCore:

Implementing && or

as function calls would lose us short-circuiting.

2 new tests in LayoutTests/webgpu/whlsl/lexing.html

• Modules/webgpu/WHLSL/WHLSLLexer.cpp:

(WebCore::WHLSL::Lexer::consumeTokenFromStream):

LayoutTests:

• webgpu/whlsl/lexing.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgpu/whlsl/lexing.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WHLSL/WHLSLLexer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-15  Robin Morisset  <rmorisset@apple.com>
+
+        [WHLSL] Don't accept operator&& or operator|| in the Lexer
+        https://bugs.webkit.org/show_bug.cgi?id=200785
+
+        Reviewed by Saam Barati.
+
+        * webgpu/whlsl/lexing.html:
+
 2019-08-15  Devin Rousso  <drousso@apple.com>
 

trunk/LayoutTests/webgpu/whlsl/lexing.html

@@ -156 +156 @@
         }
     `);
+
+    await checkFail(`
+        int operator&&(int x, int y) {
+            return 42;
+        }
+    `);
+
+    await checkFail(`
+        bool operator||(int x, int y) {
+            return 42;
+        }
+    `);
 };
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-15  Robin Morisset  <rmorisset@apple.com>
+
+        [WHLSL] Don't accept operator&& or operator|| in the Lexer
+        https://bugs.webkit.org/show_bug.cgi?id=200785
+
+        Reviewed by Saam Barati.
+
+        Implementing && or || as function calls would lose us short-circuiting.
+
+        2 new tests in LayoutTests/webgpu/whlsl/lexing.html
+
+        * Modules/webgpu/WHLSL/WHLSLLexer.cpp:
+        (WebCore::WHLSL::Lexer::consumeTokenFromStream):
+
 2019-08-15  Saam Barati  <sbarati@apple.com>
 

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

@@ -869 +869 @@
                     return token(Token::Type::OperatorName);
                 return token(Token::Type::Invalid);
-            case '&':
-                shift();
-                return token(Token::Type::OperatorName);
             case '.':
                 shift();
@@ -919 +916 @@
         case '|':
             shift();
-            consume('|');
             return token(Token::Type::OperatorName);