From 07ba5121a12f31bfeb38630e16b18310a302f6ba Mon Sep 17 00:00:00 2001 From: Nick Kledzik Date: Tue, 2 Dec 2014 01:50:44 +0000 Subject: [PATCH] [mach-o] Fix TrieEdge leak In PR21682 Jean-Daliel Dupas found a leak in the trie builder and suggested a fix was to use a list instead of SmallVector so that the list elements could be allocated in the BumpPtrAllocator. llvm-svn: 223104 --- .../ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp index 71643bd..d931865 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp @@ -40,6 +40,7 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include +#include #include #include @@ -177,7 +178,7 @@ private: private: StringRef _cummulativeString; - SmallVector _children; + std::list _children; uint64_t _address; uint64_t _flags; uint64_t _other; @@ -1079,8 +1080,8 @@ void MachOFileLayout::TrieNode::addSymbol(const Export& entry, TrieEdge& abEdge = edge; abEdge._subString = abEdgeStr; abEdge._child = bNode; - TrieEdge bcEdge(bcEdgeStr, cNode); - bNode->_children.push_back(bcEdge); + TrieEdge *bcEdge = new (allocator) TrieEdge(bcEdgeStr, cNode); + bNode->_children.push_back(std::move(*bcEdge)); bNode->addSymbol(entry, allocator, allNodes); return; } @@ -1094,8 +1095,8 @@ void MachOFileLayout::TrieNode::addSymbol(const Export& entry, } // No commonality with any existing child, make a new edge. TrieNode* newNode = new (allocator) TrieNode(entry.name.copy(allocator)); - TrieEdge newEdge(partialStr, newNode); - _children.push_back(newEdge); + TrieEdge *newEdge = new (allocator) TrieEdge(partialStr, newNode); + _children.push_back(std::move(*newEdge)); DEBUG_WITH_TYPE("trie-builder", llvm::dbgs() << "new TrieNode('" << entry.name << "') with edge '" << partialStr << "' from node='" -- 2.7.4