From 1e2908f3ccb7f281abe429f28e57d3a167c15dd5 Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Mon, 7 Jul 2014 11:06:51 +0000 Subject: [PATCH] ChainedIncludesSource: avoid copying n*(n+1)/2 file contents into memory Just reference the data instead with shallow MemoryBuffer instances. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@212450 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/ChainedIncludesSource.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/Frontend/ChainedIncludesSource.cpp b/lib/Frontend/ChainedIncludesSource.cpp index 01897cbf2a..387f67118e 100644 --- a/lib/Frontend/ChainedIncludesSource.cpp +++ b/lib/Frontend/ChainedIncludesSource.cpp @@ -126,17 +126,14 @@ ChainedIncludesSource::create(CompilerInstance &CI) { } else { assert(!serialBufs.empty()); SmallVector bufs; - for (unsigned si = 0, se = serialBufs.size(); si != se; ++si) { - bufs.push_back(llvm::MemoryBuffer::getMemBufferCopy( - StringRef(serialBufs[si]->getBufferStart(), - serialBufs[si]->getBufferSize()))); - } + // TODO: Pass through the existing MemoryBuffer instances instead of + // allocating new ones. + for (auto *SB : serialBufs) + bufs.push_back(llvm::MemoryBuffer::getMemBuffer(SB->getBuffer())); std::string pchName = includes[i-1]; llvm::raw_string_ostream os(pchName); os << ".pch" << i-1; - os.flush(); - - serialBufNames.push_back(pchName); + serialBufNames.push_back(os.str()); IntrusiveRefCntPtr Reader; Reader = createASTReader(*Clang, pchName, bufs, serialBufNames, @@ -151,11 +148,8 @@ ChainedIncludesSource::create(CompilerInstance &CI) { return nullptr; ParseAST(Clang->getSema()); - OS.flush(); Clang->getDiagnosticClient().EndSourceFile(); - serialBufs.push_back( - llvm::MemoryBuffer::getMemBufferCopy(StringRef(serialAST.data(), - serialAST.size()))); + serialBufs.push_back(llvm::MemoryBuffer::getMemBufferCopy(OS.str())); source->CIs.push_back(Clang.release()); } -- 2.50.1