Changeset 260431 in webkit

Timestamp:

Apr 21, 2020 9:21:31 AM (4 years ago)

Author:

cturner@igalia.com

Message:

[Clang 10] Fix warning: definition of implicit copy assignment operator for 'PageBlock' is deprecated because it has a user-declared copy constructor
​https://bugs.webkit.org/show_bug.cgi?id=210748

Reviewed by Adrian Perez de Castro.

Recent Clang's will issue a warning if you declare an explicit
copy construction, but leave the compiler to fill in an implicit
assignment operator. I think this is to catch cases where you do
something exciting in an assignment operator/copy constructor and
forget to do the same exciting thing in the other.

• wtf/PageAllocation.h: Import the base's constructor to avoid

defining our own identical one.

• wtf/PageBlock.h: Remove trivial constructor and replace with

member initializers. Remove copy constructor. This looks identical
to what the compiler would generate anyway.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/PageAllocation.h (modified) (1 diff)
• wtf/PageBlock.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-04-21  Charlie Turner  <cturner@igalia.com>
+
+        [Clang 10] Fix warning: definition of implicit copy assignment operator for 'PageBlock' is deprecated because it has a user-declared copy constructor
+        https://bugs.webkit.org/show_bug.cgi?id=210748
+
+        Reviewed by Adrian Perez de Castro.
+
+        Recent Clang's will issue a warning if you declare an explicit
+        copy construction, but leave the compiler to fill in an implicit
+        assignment operator. I think this is to catch cases where you do
+        something exciting in an assignment operator/copy constructor and
+        forget to do the same exciting thing in the other.
+
+        * wtf/PageAllocation.h: Import the base's constructor to avoid
+        defining our own identical one.
+        * wtf/PageBlock.h: Remove trivial constructor and replace with
+        member initializers. Remove copy constructor. This looks identical
+        to what the compiler would generate anyway.
+
 2020-04-21  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WTF/wtf/PageAllocation.h

@@ -70 +70 @@
 class PageAllocation : private PageBlock {
 public:
-    PageAllocation()
-    {
-    }
-
+    using PageBlock::PageBlock;
     using PageBlock::size;
     using PageBlock::base;

trunk/Source/WTF/wtf/PageBlock.h

@@ -67 +67 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    PageBlock();
-    PageBlock(const PageBlock&);
+    PageBlock() = default;
     PageBlock(void*, size_t, bool hasGuardPages);
     
@@ -83 +82 @@
 
 private:
-    void* m_realBase;
-    void* m_base;
-    size_t m_size;
+    void* m_realBase { nullptr };
+    void* m_base { nullptr };
+    size_t m_size { 0 };
 };
-
-inline PageBlock::PageBlock()
-    : m_realBase(0)
-    , m_base(0)
-    , m_size(0)
-{
-}
-
-inline PageBlock::PageBlock(const PageBlock& other)
-    : m_realBase(other.m_realBase)
-    , m_base(other.m_base)
-    , m_size(other.m_size)
-{
-}
 
 inline PageBlock::PageBlock(void* base, size_t size, bool hasGuardPages)