Changeset 48259 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Sep 10, 2009, 10:33:51 AM (16 years ago)

Author:

[email protected]

Message:

2009-09-10 Zoltan Horvath <​[email protected]>

Reviewed by Darin Adler.

Implement fastDeleteSkippingDestructor for FastAllocBase and fastDeleteAllValues for HashSet
​https://bugs.webkit.org/show_bug.cgi?id=25930

FastAllocBase has been extended with fastDeleteSkippingDestructor function which
releases memory without destructor call. fastDeleteAllValues has been implemented
similar as deleteAllValues but it uses fastDelete function to release memory.

• wtf/FastAllocBase.h: (WTF::fastDeleteSkippingDestructor):
• wtf/HashSet.h: (WTF::fastDeleteAllValues):

2009-09-10 Zoltan Horvath <​[email protected]>

Reviewed by Darin Adler.

Use fastNew and fastDelete instead of operator new and delete for CSSSelector class.
​https://bugs.webkit.org/show_bug.cgi?id=25930

Change using of operator new to fastNew and operator delete to
fastDeleteSkippingDestructor for CSSSelector class to avoid mismatched function call.

This change fixes valgrind's 'mismatched free' notification.

• css/CSSParser.cpp: (WebCore::CSSParser::~CSSParser): (WebCore::CSSParser::createFloatingSelector):
• css/CSSSelectorList.cpp: (WebCore::CSSSelectorList::adoptSelectorVector):

Location:

trunk/JavaScriptCore/wtf

Files:

• FastAllocBase.h (modified) (2 diffs)
• HashSet.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/FastAllocBase.h

@@ -302 +302 @@
     }
 
+    template <typename T>
+    inline void fastDeleteSkippingDestructor(T* p)
+    {
+        if (!p)
+            return;
+
+        fastMallocMatchValidateFree(p, Internal::AllocTypeFastNew);
+        fastFree(p);
+    }
+
     namespace Internal {
         // This is a support template for fastDeleteArray.
@@ -398 +408 @@
 } // namespace WTF
 
-// Using WTF::FastAllocBase to avoid using FastAllocBase's explicit qualification by WTF::.
 using WTF::FastAllocBase;
+using WTF::fastDeleteSkippingDestructor;
 
 #endif // FastAllocBase_h

trunk/JavaScriptCore/wtf/HashSet.h

@@ -30 +30 @@
     template<typename Value, typename HashFunctions, typename Traits>
     void deleteAllValues(const HashSet<Value, HashFunctions, Traits>&);
+    template<typename Value, typename HashFunctions, typename Traits>
+    void fastDeleteAllValues(const HashSet<Value, HashFunctions, Traits>&);
 
     template<typename T> struct IdentityExtractor;
@@ -92 +94 @@
     private:
         friend void deleteAllValues<>(const HashSet&);
+        friend void fastDeleteAllValues<>(const HashSet&);
 
         HashTableType m_impl;
@@ -252 +255 @@
         deleteAllValues<typename HashSet<T, U, V>::ValueType>(collection.m_impl);
     }
+
+    template<typename ValueType, typename HashTableType>
+    void fastDeleteAllValues(HashTableType& collection)
+    {
+        typedef typename HashTableType::const_iterator iterator;
+        iterator end = collection.end();
+        for (iterator it = collection.begin(); it != end; ++it)
+            fastDelete(*it);
+    }
+
+    template<typename T, typename U, typename V>
+    inline void fastDeleteAllValues(const HashSet<T, U, V>& collection)
+    {
+        fastDeleteAllValues<typename HashSet<T, U, V>::ValueType>(collection.m_impl);
+    }
     
     template<typename T, typename U, typename V, typename W>