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

Simplify. 

llvm-svn: 86935
This commit is contained in:
Daniel Dunbar 2009-11-12 02:53:13 +00:00
parent 7336edd8b2
commit 92641dca86
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/tools/clang-cc/clang-cc.cpp
View File

@ -718,6 +718,9 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
} }
llvm::OwningPtr<ASTContext> ContextOwner; llvm::OwningPtr<ASTContext> ContextOwner;
llvm::OwningPtr<ExternalASTSource> Source;
const std::string &ImplicitPCHInclude =
CompOpts.getPreprocessorOpts().getImplicitPCHInclude();
if (Consumer) if (Consumer)
ContextOwner.reset(new ASTContext(PP.getLangOptions(), ContextOwner.reset(new ASTContext(PP.getLangOptions(),
PP.getSourceManager(), PP.getSourceManager(),
@ -727,12 +730,6 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
PP.getBuiltinInfo(), PP.getBuiltinInfo(),
/* FreeMemory = */ !DisableFree, /* FreeMemory = */ !DisableFree,
/* size_reserve = */0)); /* size_reserve = */0));
llvm::OwningPtr<PCHReader> Reader;
llvm::OwningPtr<ExternalASTSource> Source;
const std::string &ImplicitPCHInclude =
CompOpts.getPreprocessorOpts().getImplicitPCHInclude();
if (Consumer && !ImplicitPCHInclude.empty()) { if (Consumer && !ImplicitPCHInclude.empty()) {
// If the user specified -isysroot, it will be used for relocatable PCH // If the user specified -isysroot, it will be used for relocatable PCH
// files. // files.
@ -740,6 +737,7 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
if (isysrootPCH[0] == '\0') if (isysrootPCH[0] == '\0')
isysrootPCH = 0; isysrootPCH = 0;
llvm::OwningPtr<PCHReader> Reader;
Reader.reset(new PCHReader(PP, ContextOwner.get(), isysrootPCH)); Reader.reset(new PCHReader(PP, ContextOwner.get(), isysrootPCH));
// The user has asked us to include a precompiled header. Load // The user has asked us to include a precompiled header. Load
@ -753,10 +751,8 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
// Attach the PCH reader to the AST context as an external AST // Attach the PCH reader to the AST context as an external AST
// source, so that declarations will be deserialized from the // source, so that declarations will be deserialized from the
// PCH file as needed. // PCH file as needed.
if (ContextOwner) { Source.reset(Reader.take());
Source.reset(Reader.take()); ContextOwner->setExternalSource(Source);
ContextOwner->setExternalSource(Source);
}
break; break;
} }