replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unique_ptrify PTHManager's PerIDCache using the newly added llvm::FreeDeleter 

llvm-svn: 216786
This commit is contained in:
David Blaikie 2014-08-29 22:04:45 +00:00
parent 60e836ba99
commit 02118cedd5
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/include/clang/Lex/PTHManager.h
View File

@ -52,7 +52,7 @@ class PTHManager : public IdentifierInfoLookup {
/// IdMap - A lazily generated cache mapping from persistent identifiers to
/// IdentifierInfo*.
IdentifierInfo** PerIDCache;
std::unique_ptr<IdentifierInfo *[], llvm::FreeDeleter> PerIDCache;
/// FileLookup - Abstract data structure used for mapping between files
/// and token data in the PTH file.
@ -86,7 +86,8 @@ class PTHManager : public IdentifierInfoLookup {
/// method.
PTHManager(std::unique_ptr<const llvm::MemoryBuffer> buf,
std::unique_ptr<PTHFileLookup> fileLookup,
const unsigned char *idDataTable, IdentifierInfo **perIDCache,
const unsigned char *idDataTable,
std::unique_ptr<IdentifierInfo *[], llvm::FreeDeleter> perIDCache,
std::unique_ptr<PTHStringIdLookup> stringIdLookup, unsigned numIds,
const unsigned char *spellingBase, const char *originalSourceFile);

26
clang/lib/Lex/PTHLexer.cpp
View File

@ -413,20 +413,18 @@ public:
// PTHManager methods.
//===----------------------------------------------------------------------===//
PTHManager::PTHManager(std::unique_ptr<const llvm::MemoryBuffer> buf,
std::unique_ptr<PTHFileLookup> fileLookup,
const unsigned char *idDataTable,
IdentifierInfo **perIDCache,
std::unique_ptr<PTHStringIdLookup> stringIdLookup,
unsigned numIds, const unsigned char *spellingBase,
const char *originalSourceFile)
: Buf(std::move(buf)), PerIDCache(perIDCache),
PTHManager::PTHManager(
std::unique_ptr<const llvm::MemoryBuffer> buf,
std::unique_ptr<PTHFileLookup> fileLookup, const unsigned char *idDataTable,
std::unique_ptr<IdentifierInfo *[], llvm::FreeDeleter> perIDCache,
std::unique_ptr<PTHStringIdLookup> stringIdLookup, unsigned numIds,
const unsigned char *spellingBase, const char *originalSourceFile)
: Buf(std::move(buf)), PerIDCache(std::move(perIDCache)),
FileLookup(std::move(fileLookup)), IdDataTable(idDataTable),
StringIdLookup(std::move(stringIdLookup)), NumIds(numIds), PP(nullptr),
SpellingBase(spellingBase), OriginalSourceFile(originalSourceFile) {}
PTHManager::~PTHManager() {
free(PerIDCache);
}
static void InvalidPTH(DiagnosticsEngine &Diags, const char *Msg) {
@ -537,10 +535,10 @@ PTHManager *PTHManager::Create(const std::string &file,
// Pre-allocate the persistent ID -> IdentifierInfo* cache. We use calloc()
// so that we in the best case only zero out memory once when the OS returns
// us new pages.
IdentifierInfo **PerIDCache = nullptr;
std::unique_ptr<IdentifierInfo *[], llvm::FreeDeleter> PerIDCache;
if (NumIds) {
PerIDCache = (IdentifierInfo**)calloc(NumIds, sizeof(*PerIDCache));
PerIDCache.reset((IdentifierInfo **)calloc(NumIds, sizeof(PerIDCache[0])));
if (!PerIDCache) {
InvalidPTH(Diags, "Could not allocate memory for processing PTH file");
return nullptr;
@ -554,9 +552,9 @@ PTHManager *PTHManager::Create(const std::string &file,
if (!len) originalSourceBase = nullptr;
// Create the new PTHManager.
return new PTHManager(std::move(File), std::move(FL), IData, PerIDCache,
std::move(SL), NumIds, spellingBase,
(const char *)originalSourceBase);
return new PTHManager(std::move(File), std::move(FL), IData,
std::move(PerIDCache), std::move(SL), NumIds,
spellingBase, (const char *)originalSourceBase);
}
IdentifierInfo* PTHManager::LazilyCreateIdentifierInfo(unsigned PersistentID) {