Changeset 247124 in webkit

Timestamp:

Jul 3, 2019 6:06:35 PM (5 years ago)

Author:

rmorisset@apple.com

Message:

[WHLSL] Make the destructor of VariableDeclaration non-virtual
​https://bugs.webkit.org/show_bug.cgi?id=199460

Reviewed by Myles C. Maxfield.

Three steps:

• Remove WHLSL::AST::Value, inlining it into its children (it is trivial, it just has one field m_origin with a getter and nothing else)
• Mark WHLSL::AST::VariableDeclaration final
• Now that it inherits from nothing and nothing can inherit from it, there is no reason for it to have any virtual method, including its destructor.

This not only saves 8 bytes from every variable declaration (for the virtual table pointer), it also should make destructing the AST at the end of compilation a bit faster by removing the virtual destructor call.

No new tests as there is no intended functional change.

• Modules/webgpu/WHLSL/AST/WHLSLAST.h:
• Modules/webgpu/WHLSL/AST/WHLSLExpression.h:

(WebCore::WHLSL::AST::Expression::Expression):
(WebCore::WHLSL::AST::Expression::origin const):

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

(WebCore::WHLSL::AST::Statement::Statement):
(WebCore::WHLSL::AST::Statement::origin const):

• Modules/webgpu/WHLSL/AST/WHLSLValue.h: Removed.
• Modules/webgpu/WHLSL/AST/WHLSLVariableDeclaration.h:
• Modules/webgpu/WHLSL/WHLSLParser.h:
• WebCore.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webgpu/WHLSL/AST/WHLSLAST.h (modified) (1 diff)
• Modules/webgpu/WHLSL/AST/WHLSLExpression.h (modified) (3 diffs)
• Modules/webgpu/WHLSL/AST/WHLSLStatement.h (modified) (3 diffs)
• Modules/webgpu/WHLSL/AST/WHLSLValue.h (deleted)
• Modules/webgpu/WHLSL/AST/WHLSLVariableDeclaration.h (modified) (4 diffs)
• Modules/webgpu/WHLSL/WHLSLParser.h (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-03  Robin Morisset  <rmorisset@apple.com>
+
+        [WHLSL] Make the destructor of VariableDeclaration non-virtual
+        https://bugs.webkit.org/show_bug.cgi?id=199460
+
+        Reviewed by Myles C. Maxfield.
+
+        Three steps:
+        - Remove WHLSL::AST::Value, inlining it into its children (it is trivial, it just has one field m_origin with a getter and nothing else)
+        - Mark WHLSL::AST::VariableDeclaration final
+        - Now that it inherits from nothing and nothing can inherit from it, there is no reason for it to have any virtual method, including its destructor.
+
+        This not only saves 8 bytes from every variable declaration (for the virtual table pointer), it also should make destructing the AST at the end of compilation a bit faster by removing the virtual destructor call.
+
+        No new tests as there is no intended functional change.
+
+        * Modules/webgpu/WHLSL/AST/WHLSLAST.h:
+        * Modules/webgpu/WHLSL/AST/WHLSLExpression.h:
+        (WebCore::WHLSL::AST::Expression::Expression):
+        (WebCore::WHLSL::AST::Expression::origin const):
+        * Modules/webgpu/WHLSL/AST/WHLSLStatement.h:
+        (WebCore::WHLSL::AST::Statement::Statement):
+        (WebCore::WHLSL::AST::Statement::origin const):
+        * Modules/webgpu/WHLSL/AST/WHLSLValue.h: Removed.
+        * Modules/webgpu/WHLSL/AST/WHLSLVariableDeclaration.h:
+        * Modules/webgpu/WHLSL/WHLSLParser.h:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2019-07-03  Sihui Liu  <sihui_liu@apple.com>
 

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

@@ -99 +99 @@
 #include "WHLSLUnsignedIntegerLiteral.h"
 #include "WHLSLUnsignedIntegerLiteralType.h"
-#include "WHLSLValue.h"
 #include "WHLSLVariableDeclaration.h"
 #include "WHLSLVariableDeclarationsStatement.h"

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

@@ -31 +31 @@
 #include "WHLSLLexer.h"
 #include "WHLSLUnnamedType.h"
-#include "WHLSLValue.h"
 #include <wtf/Optional.h>
 #include <wtf/UniqueRef.h>
@@ -41 +40 @@
 namespace AST {
 
-class Expression : public Value {
-    using Base = Value;
+class Expression {
 public:
     Expression(Lexer::Token&& origin)
-        : Base(WTFMove(origin))
+        : m_origin(WTFMove(origin))
     {
     }
@@ -115 +113 @@
     virtual bool isEnumerationMemberLiteral() const { return false; }
 
+    Lexer::Token origin() const { return m_origin; }
+
 private:
+    Lexer::Token m_origin;
     Optional<UniqueRef<UnnamedType>> m_type;
     Optional<TypeAnnotation> m_typeAnnotation;

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

@@ -29 +29 @@
 
 #include "WHLSLLexer.h"
-#include "WHLSLValue.h"
 #include <wtf/UniqueRef.h>
 
@@ -38 +37 @@
 namespace AST {
 
-class Statement : public Value {
-    using Base = Value;
+class Statement {
 public:
     Statement(Lexer::Token&& origin)
-        : Base(WTFMove(origin))
+        : m_origin(WTFMove(origin))
     {
     }
@@ -66 +64 @@
     virtual bool isVariableDeclarationsStatement() const { return false; }
     virtual bool isWhileLoop() const { return false; }
+
+    Lexer::Token origin() const { return m_origin; }
+
+private:
+    Lexer::Token m_origin;
 };
 

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

@@ -33 +33 @@
 #include "WHLSLSemantic.h"
 #include "WHLSLType.h"
-#include "WHLSLValue.h"
 #include <memory>
 #include <wtf/UniqueRef.h>
@@ -45 +44 @@
 namespace AST {
 
-class VariableDeclaration : public Value {
-    using Base = Value;
+class VariableDeclaration final {
+// Final because we made the destructor non-virtual.
 public:
     VariableDeclaration(Lexer::Token&& origin, Qualifiers&& qualifiers, Optional<UniqueRef<UnnamedType>>&& type, String&& name, std::unique_ptr<Semantic>&& semantic, std::unique_ptr<Expression>&& initializer)
-        : Base(WTFMove(origin))
+        : m_origin(WTFMove(origin))
         , m_qualifiers(WTFMove(qualifiers))
         , m_type(WTFMove(type))
@@ -58 +57 @@
     }
 
-    virtual ~VariableDeclaration() = default;
+    ~VariableDeclaration() = default;
 
     VariableDeclaration(const VariableDeclaration&) = delete;
@@ -85 +84 @@
         m_initializer = WTFMove(expression);
     }
+    Lexer::Token origin() const { return m_origin; }
 
 private:
+    Lexer::Token m_origin;
     Qualifiers m_qualifiers;
     Optional<UniqueRef<UnnamedType>> m_type;

trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLParser.h

@@ -89 +89 @@
 #include "WHLSLTypeReference.h"
 #include "WHLSLUnsignedIntegerLiteral.h"
-#include "WHLSLValue.h"
 #include "WHLSLVariableDeclaration.h"
 #include "WHLSLVariableDeclarationsStatement.h"

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -13297 +13297 @@
                 C21BF6FA21CD89BE00227979 /* WHLSLBaseSemantic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLBaseSemantic.h; sourceTree = "<group>"; };
                 C21BF6FB21CD89BE00227979 /* WHLSLDoWhileLoop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLDoWhileLoop.h; sourceTree = "<group>"; };
-                C21BF6FC21CD89BF00227979 /* WHLSLValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLValue.h; sourceTree = "<group>"; };
                 C21BF6FD21CD89C000227979 /* WHLSLFunctionDeclaration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLFunctionDeclaration.h; sourceTree = "<group>"; };
                 C21BF6FE21CD89C100227979 /* WHLSLStructureElement.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLStructureElement.h; sourceTree = "<group>"; };
@@ -17177 +17176 @@
                                 1CB69B3B21DF041E006E846A /* WHLSLUnsignedIntegerLiteralType.cpp */,
                                 1CB69B3721DED66B006E846A /* WHLSLUnsignedIntegerLiteralType.h */,
-                                C21BF6FC21CD89BF00227979 /* WHLSLValue.h */,
                                 C21BF71021CD89D000227979 /* WHLSLVariableDeclaration.h */,
                                 C21BF71421CD89D300227979 /* WHLSLVariableDeclarationsStatement.h */,