maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-cc: Unify InitializeSourceManager calls. 

llvm-svn: 86934
This commit is contained in:
Daniel Dunbar 2009-11-12 02:53:06 +00:00
parent 11881e2283
commit 7336edd8b2
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -717,7 +717,6 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
}
}
llvm::OwningPtr<ASTContext> ContextOwner;
if (Consumer)
ContextOwner.reset(new ASTContext(PP.getLangOptions(),
@ -770,27 +769,18 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
// No suitable PCH file could be found. Return an error.
return;
}
// Finish preprocessor initialization. We do this now (rather
// than earlier) because this initialization creates new source
// location entries in the source manager, which must come after
// the source location entries for the PCH file.
if (InitializeSourceManager(PP, InFile))
return;
} else if (!ImplicitPCHInclude.empty()) {
// If we have an implicit PCH, the source manager initialization was
// delayed, do it now.
//
// FIXME: Clean this up.
// Finish preprocessor initialization. We do this now (rather
// than earlier) because this initialization creates new source
// location entries in the source manager, which must come after
// the source location entries for the PCH file.
if (InitializeSourceManager(PP, InFile))
return;
}
// Initialize the main file entry. This needs to be delayed until after PCH
// has loaded.
if (InitializeSourceManager(PP, InFile))
return;
// Initialize builtin info unless we are using PCH.
if (!Consumer || ImplicitPCHInclude.empty())
PP.getBuiltinInfo().InitializeBuiltins(PP.getIdentifierTable(),
PP.getLangOptions().NoBuiltin);
// If we have an ASTConsumer, run the parser with it.
if (Consumer) {
CodeCompleteConsumer *(*CreateCodeCompleter)(Sema &, void *) = 0;
@ -1232,15 +1222,6 @@ int main(int argc, char **argv) {
CompOpts.getDependencyOutputOpts(),
*Target, SourceMgr, FileMgr));
if (CompOpts.getPreprocessorOpts().getImplicitPCHInclude().empty()) {
if (InitializeSourceManager(*PP.get(), InFile))
continue;
// Initialize builtin info.
PP->getBuiltinInfo().InitializeBuiltins(PP->getIdentifierTable(),
PP->getLangOptions().NoBuiltin);
}
// Process the source file.
Diags.getClient()->BeginSourceFile(CompOpts.getLangOpts());
ProcessInputFile(CompOpts, *PP, InFile, ProgAction, Context);