diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-02-16 01:55:04 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-02-16 01:55:04 +0000 |
| commit | b26d483a9f7fdc815e87bbbac4af916307b4c07d (patch) | |
| tree | be689d62b7992e41f9e1efc3d133a7ed47a933a6 /lib/Frontend | |
| parent | f7acc37450d59ef751df73acb91de73850cc6517 (diff) | |
ASTUnit: Constant fold UseBumpAllocator to true, we don't care to support this as an argument.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96316 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend')
| -rw-r--r-- | lib/Frontend/ASTMerge.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/ASTUnit.cpp | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/Frontend/ASTMerge.cpp b/lib/Frontend/ASTMerge.cpp index 3f74e42626..2228ea45df 100644 --- a/lib/Frontend/ASTMerge.cpp +++ b/lib/Frontend/ASTMerge.cpp @@ -38,7 +38,7 @@ void ASTMergeAction::ExecuteAction() { &CI.getASTContext()); for (unsigned I = 0, N = ASTFiles.size(); I != N; ++I) { ASTUnit *Unit = ASTUnit::LoadFromPCHFile(ASTFiles[I], CI.getDiagnostics(), - false, true); + false); if (!Unit) continue; diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index 845b4cd5a6..a0c4889c16 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -104,7 +104,6 @@ const std::string &ASTUnit::getPCHFileName() { ASTUnit *ASTUnit::LoadFromPCHFile(const std::string &Filename, Diagnostic &Diags, bool OnlyLocalDecls, - bool UseBumpAllocator, RemappedFile *RemappedFiles, unsigned NumRemappedFiles) { llvm::OwningPtr<ASTUnit> AST(new ASTUnit(true)); @@ -184,7 +183,7 @@ ASTUnit *ASTUnit::LoadFromPCHFile(const std::string &Filename, PP.getIdentifierTable(), PP.getSelectorTable(), PP.getBuiltinInfo(), - /* FreeMemory = */ !UseBumpAllocator, + /* FreeMemory = */ false, /* size_reserve = */0)); ASTContext &Context = *AST->Ctx.get(); @@ -312,7 +311,6 @@ ASTUnit *ASTUnit::LoadFromCommandLine(const char **ArgBegin, Diagnostic &Diags, llvm::StringRef ResourceFilesPath, bool OnlyLocalDecls, - bool UseBumpAllocator, RemappedFile *RemappedFiles, unsigned NumRemappedFiles) { llvm::SmallVector<const char *, 16> Args; @@ -359,11 +357,11 @@ ASTUnit *ASTUnit::LoadFromCommandLine(const char **ArgBegin, // Override any files that need remapping for (unsigned I = 0; I != NumRemappedFiles; ++I) CI->getPreprocessorOpts().addRemappedFile(RemappedFiles[I].first, - RemappedFiles[I].second); + RemappedFiles[I].second); // Override the resources path. CI->getHeaderSearchOpts().ResourceDir = ResourceFilesPath; - CI->getFrontendOpts().DisableFree = UseBumpAllocator; + CI->getFrontendOpts().DisableFree = true; return LoadFromCompilerInvocation(CI.take(), Diags, OnlyLocalDecls); } |