Changeset 245662 in webkit

Timestamp:

May 22, 2019, 5:33:45 PM (7 years ago)

Author:

sbarati@apple.com

Message:

WHLSL: fix enum parsing
​https://bugs.webkit.org/show_bug.cgi?id=198087

Reviewed by Myles Maxfield.

Source/WebCore:

This fixes two bugs:

1. We were using a String by reference after moving the underlying owner of

the string. This would lead to the String becoming the empty value, and
crashing when used as a key in a hash map.

2. We were incorrectly producing a syntax error for enum declarations by

saying it's invalid if an enum value was added to a hash map for the first
time. This logic should be negated. We need to error when it's added for
the second time and onwards.

Test: webgpu/whlsl-dont-crash-parsing-enum.html

• Modules/webgpu/WHLSL/AST/WHLSLAST.h: Replaced.
• Modules/webgpu/WHLSL/AST/WHLSLEnumerationDefinition.h:

(WebCore::WHLSL::AST::EnumerationDefinition::add):

• Modules/webgpu/WHLSL/AST/WHLSLEnumerationMember.h:

(WebCore::WHLSL::AST::EnumerationMember::name):

• Modules/webgpu/WHLSL/WHLSLASTDumper.cpp: Replaced.

(WebCore::WHLSL::ASTDumper::visit):

• Modules/webgpu/WHLSL/WHLSLASTDumper.h: Replaced.

LayoutTests:

• webgpu/whlsl-dont-crash-parsing-enum-expected.html: Added.
• webgpu/whlsl-dont-crash-parsing-enum.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgpu/whlsl-dont-crash-parsing-enum-expected.html (added)
• LayoutTests/webgpu/whlsl-dont-crash-parsing-enum.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLEnumerationDefinition.h (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLEnumerationMember.h (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WHLSL/WHLSLASTDumper.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-22  Saam barati  <sbarati@apple.com>
+
+        WHLSL: fix enum parsing
+        https://bugs.webkit.org/show_bug.cgi?id=198087
+
+        Reviewed by Myles Maxfield.
+
+        * webgpu/whlsl-dont-crash-parsing-enum-expected.html: Added.
+        * webgpu/whlsl-dont-crash-parsing-enum.html: Added.
+
 2019-05-22  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-22  Saam barati  <sbarati@apple.com>
+
+        WHLSL: fix enum parsing
+        https://bugs.webkit.org/show_bug.cgi?id=198087
+
+        Reviewed by Myles Maxfield.
+
+        This fixes two bugs:
+        
+        1. We were using a String by reference after moving the underlying owner of
+        the string. This would lead to the String becoming the empty value, and
+        crashing when used as a key in a hash map.
+        2. We were incorrectly producing a syntax error for enum declarations by
+        saying it's invalid if an enum value was added to a hash map for the first
+        time. This logic should be negated. We need to error when it's added for
+        the second time and onwards.
+
+        Test: webgpu/whlsl-dont-crash-parsing-enum.html
+
+        * Modules/webgpu/WHLSL/AST/WHLSLAST.h: Replaced.
+        * Modules/webgpu/WHLSL/AST/WHLSLEnumerationDefinition.h:
+        (WebCore::WHLSL::AST::EnumerationDefinition::add):
+        * Modules/webgpu/WHLSL/AST/WHLSLEnumerationMember.h:
+        (WebCore::WHLSL::AST::EnumerationMember::name):
+        * Modules/webgpu/WHLSL/WHLSLASTDumper.cpp: Replaced.
+        (WebCore::WHLSL::ASTDumper::visit):
+        * Modules/webgpu/WHLSL/WHLSLASTDumper.h: Replaced.
+
 2019-05-22  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLEnumerationDefinition.h

@@ -65 +65 @@
     {
         auto result = m_members.add(member.name(), std::make_unique<EnumerationMember>(WTFMove(member)));
-        return !result.isNewEntry;
+        return result.isNewEntry;
     }
 

trunk/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLEnumerationMember.h

@@ -56 +56 @@
 
     const Lexer::Token& origin() const { return m_origin; }
-    String& name() { return m_name; }
+    String name() { return m_name; }
     Optional<ConstantExpression>& value() { return m_value; }
 

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

@@ -112 +112 @@
 void ASTDumper::visit(AST::EnumerationDefinition& enumerationDefinition)
 {
-    // FIXME: Test this once we parse enums:
-    // https://bugs.webkit.org/show_bug.cgi?id=198087
-
-    m_out.println(m_indent, "enum ");
+    m_out.print(m_indent, "enum ");
     visit(enumerationDefinition.type());
     m_out.print(" {");
@@ -340 +337 @@
 }
 
-void ASTDumper::visit(AST::EnumerationMemberLiteral&)
-{
-    // FIXME: Handle this when we can parse enums:
-    // https://bugs.webkit.org/show_bug.cgi?id=198087
+void ASTDumper::visit(AST::EnumerationMemberLiteral& enumerationMemberLiteral)
+{
+    m_out.print(enumerationMemberLiteral.left(), ".", enumerationMemberLiteral.right());
 }