Changeset 47582 in webkit for trunk/JavaScriptCore/parser/ParserArena.cpp

Timestamp:

Aug 20, 2009, 11:04:37 AM (16 years ago)

Author:

[email protected]

Message:

Roll out r47571 and related build fixes as it caused us to leak the world without warning.

File:

• trunk/JavaScriptCore/parser/ParserArena.cpp (modified) (2 diffs)

trunk/JavaScriptCore/parser/ParserArena.cpp

@@ -31 +31 @@
 namespace JSC {
 
-ParserArena::ParserArena()
-    : m_freeableMemory(0)
-    , m_freeablePoolEnd(0)
-    , m_identifierArena(new IdentifierArena)
-{
-}
-
-inline void* ParserArena::freeablePool()
-{
-    ASSERT(m_freeablePoolEnd);
-    return m_freeablePoolEnd - freeablePoolSize;
-}
-
-inline void ParserArena::deallocateObjects()
-{
-    if (m_freeablePoolEnd)
-        fastFree(freeablePool());
-
-    size_t size = m_freeablePools.size();
-    for (size_t i = 0; i < size; ++i)
-        fastFree(m_freeablePools[i]);
-
-    size = m_deletableObjects.size();
-    for (size_t i = 0; i < size; ++i) {
-        ParserArenaDeletable* object = m_deletableObjects[i];
-        object->~ParserArenaDeletable();
-        fastFree(object);
-    }
-}
-
 ParserArena::~ParserArena()
 {
-    deallocateObjects();
+    deleteAllValues(m_deletableObjects);
 }
 
@@ -83 +53 @@
 void ParserArena::reset()
 {
-    // Since this code path is used only when parsing fails, it's not bothering to reuse
-    // any of the memory the arena allocated. We could improve that later if we want to
-    // efficiently reuse the same arena.
-
-    deallocateObjects();
-
-    m_freeableMemory = 0;
-    m_freeablePoolEnd = 0;
-    m_identifierArena->clear();
-    m_freeablePools.clear();
-    m_deletableObjects.clear();
-    m_refCountedObjects.clear();
-}
-
-void ParserArena::allocateFreeablePool()
-{
-    if (m_freeablePoolEnd)
-        m_freeablePools.append(freeablePool());
-
-    char* pool = static_cast<char*>(fastMalloc(freeablePoolSize));
-    m_freeableMemory = pool;
-    m_freeablePoolEnd = pool + freeablePoolSize;
-    ASSERT(freeablePool() == pool);
-}
-
-bool ParserArena::isEmpty() const
-{
-    return !m_freeablePoolEnd
-        && m_identifierArena->isEmpty()
-        && m_freeablePools.isEmpty()
-        && m_deletableObjects.isEmpty()
-        && m_refCountedObjects.isEmpty();
-}
-
-void ParserArena::derefWithArena(PassRefPtr<ParserArenaRefCounted> object)
-{
-    m_refCountedObjects.append(object);
+    deleteAllValues(m_deletableObjects);
+    m_deletableObjects.shrink(0);
+    m_refCountedObjects.shrink(0);
 }