Changeset 251008 in webkit

Timestamp:

Oct 11, 2019 7:30:20 AM (5 years ago)

Author:

Jonathan Bedard

Message:

Unreviewed, rolling out r250945.

Broke 18 Debug API tests

Reverted changeset:

"Add support for CompactPointerTuple<..., OptionSet<...>>"
​https://bugs.webkit.org/show_bug.cgi?id=201316
​https://trac.webkit.org/changeset/250945

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/CompactPointerTuple.h (modified) (7 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.h (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WTF/CompactPointerTuple.cpp (deleted)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-10-11  Jonathan Bedard  <jbedard@apple.com>
+
+        Unreviewed, rolling out r250945.
+
+        Broke 18 Debug API tests
+
+        Reverted changeset:
+
+        "Add support for CompactPointerTuple<..., OptionSet<...>>"
+        https://bugs.webkit.org/show_bug.cgi?id=201316
+        https://trac.webkit.org/changeset/250945
+
 2019-10-11  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Source/WTF/wtf/CompactPointerTuple.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2018 Yusuke Suzuki <utatane.tea@gmail.com>.
- * Copyright (C) 2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +27 @@
 
 #include <type_traits>
-#include <wtf/OptionSet.h>
 #include <wtf/StdLibExtras.h>
 
 namespace WTF {
-
-template <typename T>
-struct IsOptionSet : public std::integral_constant<bool, WTF::IsTemplate<std::decay_t<T>, OptionSet>::value> { };
-
-template<typename T> struct ByteValueTypeAdapter {
-    static constexpr uint8_t toByte(T value) { return value; }
-    static constexpr T fromByte(uint8_t value) { return static_cast<T>(value); }
-};
-
-template<typename U> struct ByteValueTypeAdapter<OptionSet<U>> {
-    static constexpr uint8_t toByte(OptionSet<U> value) { return value.toRaw(); }
-    static constexpr OptionSet<U> fromByte(uint8_t value) { return OptionSet<U>::fromRaw(value); }
-};
 
 // The goal of this class is folding a pointer and 1 byte value into 8 bytes in both 32bit and 64bit architectures.
@@ -50 +35 @@
 // In 64bit, we use the upper 5 bits and lower 3 bits (zero due to alignment) since these bits are safe to use even
 // with 5-level page tables where the effective pointer width is 57bits.
-template<typename PointerType, typename Type, typename Adapter = ByteValueTypeAdapter<Type>>
+template<typename PointerType, typename Type>
 class CompactPointerTuple final {
     WTF_MAKE_FAST_ALLOCATED;
@@ -56 +41 @@
     static_assert(sizeof(Type) == 1, "");
     static_assert(std::is_pointer<PointerType>::value, "");
-    static_assert(std::is_integral<Type>::value || std::is_enum<Type>::value || IsOptionSet<Type>::value, "");
+    static_assert(std::is_integral<Type>::value || std::is_enum<Type>::value, "");
 
     CompactPointerTuple() = default;
@@ -78 +63 @@
 
     CompactPointerTuple(PointerType pointer, Type type)
-        : m_data { bitwise_cast<uint64_t>(pointer) | encodeType(Adapter::toByte(type)) }
+        : m_data(bitwise_cast<uint64_t>(pointer) | encodeType(static_cast<uint8_t>(type)))
     {
         ASSERT((bitwise_cast<uint64_t>(pointer) & 0b111) == 0x0);
@@ -91 +76 @@
     }
 
-    Type type() const { return Adapter::fromByte(decodeType(m_data)); }
+    Type type() const { return static_cast<Type>(decodeType(m_data)); }
     void setType(Type type)
     {
@@ -114 +99 @@
 private:
     PointerType m_pointer { nullptr };
-    Type m_type { };
+    Type m_type { 0 };
 #endif
 };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-11  Jonathan Bedard  <jbedard@apple.com>
+
+        Unreviewed, rolling out r250945.
+
+        Broke 18 Debug API tests
+
+        Reverted changeset:
+
+        "Add support for CompactPointerTuple<..., OptionSet<...>>"
+        https://bugs.webkit.org/show_bug.cgi?id=201316
+        https://trac.webkit.org/changeset/250945
+
 2019-10-11  Bjorn Melinder  <bjornm@spotify.com>
 

trunk/Source/WebCore/dom/Node.h

@@ -37 +37 @@
 #include <wtf/ListHashSet.h>
 #include <wtf/MainThread.h>
-#include <wtf/OptionSet.h>
 #include <wtf/URLHash.h>
 
@@ -617 +616 @@
     };
 
-    bool hasStyleFlag(ElementStyleFlag state) const { return m_rendererWithStyleFlags.type().contains(state); }
-    void setStyleFlag(ElementStyleFlag state) { m_rendererWithStyleFlags.setType(m_rendererWithStyleFlags.type() | state); }
-    void clearStyleFlags() { m_rendererWithStyleFlags.setType({ }); }
+    bool hasStyleFlag(ElementStyleFlag state) const { return m_rendererWithStyleFlags.type() & static_cast<uint8_t>(state); }
+    void setStyleFlag(ElementStyleFlag state) { m_rendererWithStyleFlags.setType(m_rendererWithStyleFlags.type() | static_cast<uint8_t>(state)); }
+    void clearStyleFlags() { m_rendererWithStyleFlags.setType(0); }
 
     virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const { }
@@ -677 +676 @@
     Node* m_previous { nullptr };
     Node* m_next { nullptr };
-    CompactPointerTuple<RenderObject*, OptionSet<ElementStyleFlag>> m_rendererWithStyleFlags;
+    CompactPointerTuple<RenderObject*, uint8_t> m_rendererWithStyleFlags;
     std::unique_ptr<NodeRareData, NodeRareDataDeleter> m_rareData;
 };

trunk/Tools/ChangeLog

@@ +1 @@
+2019-10-11  Jonathan Bedard  <jbedard@apple.com>
+
+        Unreviewed, rolling out r250945.
+
+        Broke 18 Debug API tests
+
+        Reverted changeset:
+
+        "Add support for CompactPointerTuple<..., OptionSet<...>>"
+        https://bugs.webkit.org/show_bug.cgi?id=201316
+        https://trac.webkit.org/changeset/250945
+
 2019-10-10  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -928 +928 @@
                 CE6E81A420A933D500E2C80F /* set-timeout-function.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CE6E81A320A933B800E2C80F /* set-timeout-function.html */; };
                 CE78705F2107AB980053AC67 /* MoveOnlyLifecycleLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE78705D2107AB8C0053AC67 /* MoveOnlyLifecycleLogger.cpp */; };
-                CE9B07F2231889E300A09BC7 /* CompactPointerTuple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE9B07F1231889E300A09BC7 /* CompactPointerTuple.cpp */; };
                 CEA6CF2819CCF69D0064F5A7 /* open-and-close-window.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CEA6CF2719CCF69D0064F5A7 /* open-and-close-window.html */; };
                 CEA7F57D2089624B0078EF6E /* DidResignInputElementStrongPasswordAppearance.mm in Sources */ = {isa = PBXBuildFile; fileRef = CEA7F57B20895F5B0078EF6E /* DidResignInputElementStrongPasswordAppearance.mm */; };
@@ -2405 +2404 @@
                 CE78705C2107AB8C0053AC67 /* MoveOnlyLifecycleLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoveOnlyLifecycleLogger.h; sourceTree = "<group>"; };
                 CE78705D2107AB8C0053AC67 /* MoveOnlyLifecycleLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MoveOnlyLifecycleLogger.cpp; sourceTree = "<group>"; };
-                CE9B07F1231889E300A09BC7 /* CompactPointerTuple.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CompactPointerTuple.cpp; sourceTree = "<group>"; };
                 CEA6CF2219CCF5BD0064F5A7 /* OpenAndCloseWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenAndCloseWindow.mm; sourceTree = "<group>"; };
                 CEA6CF2719CCF69D0064F5A7 /* open-and-close-window.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "open-and-close-window.html"; sourceTree = "<group>"; };
@@ -3623 +3621 @@
                                 E40019301ACE9B5C001B0A2A /* BloomFilter.cpp */,
                                 A7A966DA140ECCC8005EF9B4 /* CheckedArithmeticOperations.cpp */,
-                                CE9B07F1231889E300A09BC7 /* CompactPointerTuple.cpp */,
                                 0F30CB5B1FCE1792004B5323 /* ConcurrentPtrHashSet.cpp */,
                                 0FEAE3671B7D19CB00CE17F2 /* Condition.cpp */,
@@ -4315 +4312 @@
                                 7C83DE9C1D0A590C00FEBCF3 /* BloomFilter.cpp in Sources */,
                                 7C83DEA01D0A590C00FEBCF3 /* CheckedArithmeticOperations.cpp in Sources */,
-                                CE9B07F2231889E300A09BC7 /* CompactPointerTuple.cpp in Sources */,
                                 0F30CB5C1FCE1796004B5323 /* ConcurrentPtrHashSet.cpp in Sources */,
                                 7C83DEC31D0A590C00FEBCF3 /* Condition.cpp in Sources */,