From b297e0fa5c217c9467033b7c8b46891a52870120 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 16 Oct 2012 14:56:46 +0200 Subject: Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)" This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78. Caused OOM issues on some CI machines :( --- Source/JavaScriptCore/tools/ProfileTreeNode.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/JavaScriptCore/tools/ProfileTreeNode.h') diff --git a/Source/JavaScriptCore/tools/ProfileTreeNode.h b/Source/JavaScriptCore/tools/ProfileTreeNode.h index 7b5a95ec4..7b51efb85 100644 --- a/Source/JavaScriptCore/tools/ProfileTreeNode.h +++ b/Source/JavaScriptCore/tools/ProfileTreeNode.h @@ -51,7 +51,7 @@ public: ProfileTreeNode newEntry; Map::AddResult result = m_children->add(String(name), newEntry); - ProfileTreeNode* childInMap = &result.iterator->value; + ProfileTreeNode* childInMap = &result.iterator->second; ++childInMap->m_count; return childInMap; } @@ -72,7 +72,7 @@ public: return 0; uint64_t childCount = 0; for (Map::iterator it = m_children->begin(); it != m_children->end(); ++it) - childCount += it->value.count(); + childCount += it->second.count(); return childCount; } @@ -97,19 +97,19 @@ private: for (unsigned i = 0; i < indent; ++i) dataLog(" "); dataLog("% 8lld: %s (%lld stack top)\n", - static_cast(entry->value.count()), - entry->key.utf8().data(), - static_cast(entry->value.count() - entry->value.childCount())); + static_cast(entry->second.count()), + entry->first.utf8().data(), + static_cast(entry->second.count() - entry->second.childCount())); // Recursively dump the child nodes. - entry->value.dumpInternal(indent + 1); + entry->second.dumpInternal(indent + 1); } } static int compareEntries(const void* a, const void* b) { - uint64_t da = (*static_cast(a))->value.count(); - uint64_t db = (*static_cast(b))->value.count(); + uint64_t da = (*static_cast(a))->second.count(); + uint64_t db = (*static_cast(b))->second.count(); return (da < db) - (da > db); } -- cgit v1.2.1