Removed "SourceFile" from TranslationUnit. This same information will (soon)
be available by querying the SourceManager within the ASTContext referenced by
the TranslationUnit.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45223 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 259339c..63f4349 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -894,7 +894,7 @@
/// CreateASTConsumer - Create the ASTConsumer for the corresponding program
/// action. These consumers can operate on both ASTs that are freshly
/// parsed from source files as well as those deserialized from Bitcode.
-static ASTConsumer* CreateASTConsumer(const std::string& SourceFile,
+static ASTConsumer* CreateASTConsumer(const std::string& InFile,
Diagnostic& Diag, FileManager& FileMgr,
const LangOptions& LangOpts) {
switch (ProgAction) {
@@ -924,14 +924,14 @@
return CreateUnitValsChecker(Diag);
case TestSerialization:
- return CreateSerializationTest(SourceFile, Diag, FileMgr, LangOpts);
+ return CreateSerializationTest(Diag, FileMgr, LangOpts);
case EmitLLVM:
return CreateLLVMEmitter(Diag, LangOpts);
case SerializeAST:
// FIXME: Allow user to tailor where the file is written.
- return CreateASTSerializer(SourceFile, Diag, LangOpts);
+ return CreateASTSerializer(InFile, Diag, LangOpts);
case RewriteTest:
return CreateCodeRewriterTest(Diag);
@@ -941,7 +941,7 @@
/// ProcessInputFile - Process a single input file with the specified state.
///
static void ProcessInputFile(Preprocessor &PP, unsigned MainFileID,
- const std::string &SourceFile,
+ const std::string &InFile,
TextDiagnostics &OurDiagnosticClient) {
ASTConsumer* Consumer = NULL;
@@ -949,7 +949,8 @@
switch (ProgAction) {
default:
- Consumer = CreateASTConsumer(SourceFile, PP.getDiagnostics(),
+ Consumer = CreateASTConsumer(InFile,
+ PP.getDiagnostics(),
PP.getFileManager(),
PP.getLangOptions());
@@ -957,6 +958,7 @@
fprintf(stderr, "Unexpected program action!\n");
return;
}
+
break;
case DumpTokens: { // Token dump mode.
@@ -1012,7 +1014,7 @@
}
if (Stats) {
- fprintf(stderr, "\nSTATISTICS FOR '%s':\n", SourceFile.c_str());
+ fprintf(stderr, "\nSTATISTICS FOR '%s':\n", InFile.c_str());
PP.PrintStats();
PP.getIdentifierTable().PrintStats();
PP.getHeaderSearchInfo().PrintStats();
@@ -1054,8 +1056,7 @@
// Observe that we use the source file name stored in the deserialized
// translation unit, rather than InFile.
llvm::scoped_ptr<ASTConsumer>
- Consumer(CreateASTConsumer(TU->getSourceFile(), Diag, FileMgr,
- TU->getLangOpts()));
+ Consumer(CreateASTConsumer(InFile, Diag, FileMgr, TU->getLangOpts()));
if (!Consumer) {
fprintf(stderr, "Unsupported program action with serialized ASTs!\n");