Changeset 280643 in webkit

Timestamp:

Aug 4, 2021, 11:02:20 AM (5 years ago)

Author:

Antti Koivisto

Message:

Use fast malloc for RuleData vectors
​https://bugs.webkit.org/show_bug.cgi?id=228770

Reviewed by Chris Dumez.

Revert the change that enabled probabilistic guard malloc as it is not needed anymore.

• style/RuleFeature.h:
• style/RuleSet.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• style/RuleFeature.h (modified) (3 diffs)
• style/RuleSet.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-04  Antti Koivisto  <antti@apple.com>
+
+        Use fast malloc for RuleData vectors
+        https://bugs.webkit.org/show_bug.cgi?id=228770
+
+        Reviewed by Chris Dumez.
+
+        Revert the change that enabled probabilistic guard malloc as it is not needed anymore.
+
+        * style/RuleFeature.h:
+        * style/RuleSet.h:
+
 2021-08-04  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/style/RuleFeature.h

@@ -26 +26 @@
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
-#include <wtf/SystemMalloc.h>
 #include <wtf/text/AtomString.h>
 #include <wtf/text/AtomStringHash.h>
@@ -40 +39 @@
 enum class MatchElement : uint8_t { Subject, Parent, Ancestor, DirectSibling, IndirectSibling, AnySibling, ParentSibling, AncestorSibling, Host };
 constexpr unsigned matchElementCount = static_cast<unsigned>(MatchElement::Host) + 1;
-
-#if HAVE(PROBABILISTIC_GUARD_MALLOC)
-// Help finding rdar://77450900
-using RuleMalloc = ProbabilisticGuardMalloc;
-#else
-using RuleMalloc = FastMalloc;
-#endif
 
 struct RuleFeature {
@@ -67 +59 @@
 };
 
-using RuleFeatureVector = Vector<RuleFeature, 0, CrashOnOverflow, 16, RuleMalloc>;
+using RuleFeatureVector = Vector<RuleFeature>;
 
 struct RuleFeatureSet {

trunk/Source/WebCore/style/RuleSet.h

@@ -68 +68 @@
     ~RuleSet();
 
-    typedef Vector<RuleData, 1, CrashOnOverflow, 16, RuleMalloc> RuleDataVector;
+    typedef Vector<RuleData, 1> RuleDataVector;
     typedef HashMap<AtomString, std::unique_ptr<RuleDataVector>> AtomRuleMap;