From 230bd918b2a6ac14cd1f03f1599cf081d8c5b64c Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Wed, 19 Dec 2007 22:51:13 +0000 Subject: [PATCH] Interned MainFileID within SourceManager. Since SourceManager is referenced by both Preprocessor and ASTContext, we no longer need to explicitly pass MainFileID around in function calls that also pass either Preprocessor or ASTContext. This resulted in some nice cleanups in the ASTConsumers and the driver. llvm-svn: 45228 --- clang/Driver/ASTConsumers.cpp | 14 +++++++------- clang/Driver/DiagChecker.cpp | 16 ++++++++-------- clang/Driver/PrintPreprocessedOutput.cpp | 4 ++-- clang/Driver/RewriteTest.cpp | 6 +++--- clang/Driver/SerializationTest.cpp | 2 +- clang/Driver/clang.cpp | 22 ++++++++++------------ clang/Driver/clang.h | 7 +++---- clang/Lex/Preprocessor.cpp | 5 ++++- clang/Sema/ASTStreamer.cpp | 12 ++++++------ clang/include/clang/AST/ASTConsumer.h | 4 ++-- clang/include/clang/Lex/Preprocessor.h | 3 +-- clang/include/clang/Sema/ASTStreamer.h | 3 +-- 12 files changed, 48 insertions(+), 50 deletions(-) diff --git a/clang/Driver/ASTConsumers.cpp b/clang/Driver/ASTConsumers.cpp index 02e30d31b19b..add349ce82e9 100644 --- a/clang/Driver/ASTConsumers.cpp +++ b/clang/Driver/ASTConsumers.cpp @@ -356,7 +356,7 @@ namespace { public: ASTDumper() : DeclPrinter() {} - void Initialize(ASTContext &Context, unsigned MainFileID) { + void Initialize(ASTContext &Context) { SM = &Context.getSourceManager(); } @@ -400,7 +400,7 @@ namespace { class ASTViewer : public ASTConsumer { SourceManager *SM; public: - void Initialize(ASTContext &Context, unsigned MainFileID) { + void Initialize(ASTContext &Context) { SM = &Context.getSourceManager(); } @@ -482,7 +482,7 @@ namespace { class LivenessVisitor : public CFGVisitor { SourceManager *SM; public: - virtual void Initialize(ASTContext &Context, unsigned MainFileID) { + virtual void Initialize(ASTContext &Context) { SM = &Context.getSourceManager(); } @@ -507,7 +507,7 @@ namespace { ASTContext *Ctx; public: DeadStoreVisitor(Diagnostic &diags) : Diags(diags) {} - virtual void Initialize(ASTContext &Context, unsigned MainFileID) { + virtual void Initialize(ASTContext &Context) { Ctx = &Context; } @@ -530,7 +530,7 @@ namespace { ASTContext *Ctx; public: UninitValsVisitor(Diagnostic &diags) : Diags(diags) {} - virtual void Initialize(ASTContext &Context, unsigned MainFileID) { + virtual void Initialize(ASTContext &Context) { Ctx = &Context; } @@ -565,7 +565,7 @@ namespace { LLVMEmitter(Diagnostic &diags, const LangOptions &LO) : Diags(diags) , Features(LO) {} - virtual void Initialize(ASTContext &Context, unsigned MainFileID) { + virtual void Initialize(ASTContext &Context) { Ctx = &Context; M = new llvm::Module("foo"); M->setTargetTriple(Ctx->Target.getTargetTriple()); @@ -618,7 +618,7 @@ namespace { const LangOptions &LO) : Diags(diags), TU(LO), FName(F) {} - virtual void Initialize(ASTContext &Context, unsigned MainFileID) { + virtual void Initialize(ASTContext &Context) { TU.setContext(&Context); } diff --git a/clang/Driver/DiagChecker.cpp b/clang/Driver/DiagChecker.cpp index 53eed43c2cc7..cc5dd7512e86 100644 --- a/clang/Driver/DiagChecker.cpp +++ b/clang/Driver/DiagChecker.cpp @@ -82,16 +82,16 @@ static void FindDiagnostics(const std::string &Comment, } } -/// FindExpectedDiags - Lex the file to finds all of the expected errors and -/// warnings. -static void FindExpectedDiags(Preprocessor &PP, unsigned MainFileID, +/// FindExpectedDiags - Lex the main source file to find all of the +// expected errors and warnings. +static void FindExpectedDiags(Preprocessor &PP, DiagList &ExpectedErrors, DiagList &ExpectedWarnings) { // Return comments as tokens, this is how we find expected diagnostics. PP.SetCommentRetentionState(true, true); // Enter the cave. - PP.EnterMainSourceFile(MainFileID); + PP.EnterMainSourceFile(); // Turn off all warnings from relexing or preprocessing. PP.getDiagnostics().setWarnOnExtensions(false); @@ -225,14 +225,14 @@ static bool CheckResults(Preprocessor &PP, /// CheckASTConsumer - Implement diagnostic checking for AST consumers. -bool clang::CheckASTConsumer(Preprocessor &PP, unsigned MainFileID, - ASTConsumer* C) { +bool clang::CheckASTConsumer(Preprocessor &PP, ASTConsumer* C) { + // Parse the AST and run the consumer, ultimately deleting C. - ParseAST(PP, MainFileID, C); + ParseAST(PP, C); // Gather the set of expected diagnostics. DiagList ExpectedErrors, ExpectedWarnings; - FindExpectedDiags(PP, MainFileID, ExpectedErrors, ExpectedWarnings); + FindExpectedDiags(PP, ExpectedErrors, ExpectedWarnings); // Check that the expected diagnostics occurred. return CheckResults(PP, ExpectedErrors, ExpectedWarnings); diff --git a/clang/Driver/PrintPreprocessedOutput.cpp b/clang/Driver/PrintPreprocessedOutput.cpp index 109664b8cc3b..0c8a62ee669d 100644 --- a/clang/Driver/PrintPreprocessedOutput.cpp +++ b/clang/Driver/PrintPreprocessedOutput.cpp @@ -531,7 +531,7 @@ bool PrintPPOutputPPCallbacks::AvoidConcat(const Token &PrevTok, /// DoPrintPreprocessedInput - This implements -E mode. /// -void clang::DoPrintPreprocessedInput(unsigned MainFileID, Preprocessor &PP) { +void clang::DoPrintPreprocessedInput(Preprocessor &PP) { // Inform the preprocessor whether we want it to retain comments or not, due // to -C or -CC. PP.SetCommentRetentionState(EnableCommentOutput, EnableMacroCommentOutput); @@ -550,7 +550,7 @@ void clang::DoPrintPreprocessedInput(unsigned MainFileID, Preprocessor &PP) { // After we have configured the preprocessor, enter the main file. // Start parsing the specified input file. - PP.EnterMainSourceFile(MainFileID); + PP.EnterMainSourceFile(); // Consume all of the tokens that come from the predefines buffer. Those // should not be emitted into the output and are guaranteed to be at the diff --git a/clang/Driver/RewriteTest.cpp b/clang/Driver/RewriteTest.cpp index c5de07002140..c9dd0f731cda 100644 --- a/clang/Driver/RewriteTest.cpp +++ b/clang/Driver/RewriteTest.cpp @@ -62,7 +62,7 @@ namespace { static const int OBJC_ABI_VERSION =7 ; public: - void Initialize(ASTContext &context, unsigned mainFileID) { + void Initialize(ASTContext &context) { Context = &context; SM = &Context->getSourceManager(); MsgSendFunctionDecl = 0; @@ -81,7 +81,7 @@ namespace { SuperStructDecl = 0; // Get the ID and start/end of the main file. - MainFileID = mainFileID; + MainFileID = SM->getMainFileID(); const llvm::MemoryBuffer *MainBuf = SM->getBuffer(MainFileID); MainFileStart = MainBuf->getBufferStart(); MainFileEnd = MainBuf->getBufferEnd(); @@ -123,7 +123,7 @@ namespace { "extern Protocol *objc_getProtocol(const char *);\n" "#include \n"; - Rewrite.InsertText(SourceLocation::getFileLoc(mainFileID, 0), + Rewrite.InsertText(SourceLocation::getFileLoc(MainFileID, 0), s, strlen(s)); } diff --git a/clang/Driver/SerializationTest.cpp b/clang/Driver/SerializationTest.cpp index d43b570345bc..a668c7466b93 100644 --- a/clang/Driver/SerializationTest.cpp +++ b/clang/Driver/SerializationTest.cpp @@ -42,7 +42,7 @@ public: ~SerializationTest(); - virtual void Initialize(ASTContext& context, unsigned) { + virtual void Initialize(ASTContext& context) { TU.setContext(&context); } diff --git a/clang/Driver/clang.cpp b/clang/Driver/clang.cpp index 1bb4a1aa04f3..f38c83a6f8c0 100644 --- a/clang/Driver/clang.cpp +++ b/clang/Driver/clang.cpp @@ -878,9 +878,9 @@ static void InitializeIncludePaths(HeaderSearch &Headers, FileManager &FM, // Basic Parser driver //===----------------------------------------------------------------------===// -static void ParseFile(Preprocessor &PP, MinimalAction *PA, unsigned MainFileID){ +static void ParseFile(Preprocessor &PP, MinimalAction *PA){ Parser P(PP, *PA); - PP.EnterMainSourceFile(MainFileID); + PP.EnterMainSourceFile(); // Parsing the specified input file. P.ParseTranslationUnit(); @@ -963,7 +963,7 @@ static void ProcessInputFile(Preprocessor &PP, const std::string &InFile, case DumpTokens: { // Token dump mode. Token Tok; // Start parsing the specified input file. - PP.EnterMainSourceFile(MainFileID); + PP.EnterMainSourceFile(); do { PP.Lex(Tok); PP.DumpToken(Tok, true); @@ -975,7 +975,7 @@ static void ProcessInputFile(Preprocessor &PP, const std::string &InFile, case RunPreprocessorOnly: { // Just lex as fast as we can, no output. Token Tok; // Start parsing the specified input file. - PP.EnterMainSourceFile(MainFileID); + PP.EnterMainSourceFile(); do { PP.Lex(Tok); } while (Tok.isNot(tok::eof)); @@ -984,18 +984,17 @@ static void ProcessInputFile(Preprocessor &PP, const std::string &InFile, } case PrintPreprocessedInput: // -E mode. - DoPrintPreprocessedInput(MainFileID, PP); + DoPrintPreprocessedInput(PP); ClearSourceMgr = true; break; case ParseNoop: // -parse-noop - ParseFile(PP, new MinimalAction(PP.getIdentifierTable()), MainFileID); + ParseFile(PP, new MinimalAction(PP.getIdentifierTable())); ClearSourceMgr = true; break; case ParsePrintCallbacks: - ParseFile(PP, CreatePrintParserActionsAction(PP.getIdentifierTable()), - MainFileID); + ParseFile(PP, CreatePrintParserActionsAction(PP.getIdentifierTable())); ClearSourceMgr = true; break; @@ -1006,10 +1005,10 @@ static void ProcessInputFile(Preprocessor &PP, const std::string &InFile, if (Consumer) { if (VerifyDiagnostics) - exit(CheckASTConsumer(PP, MainFileID, Consumer)); + exit(CheckASTConsumer(PP, Consumer)); // This deletes Consumer. - ParseAST(PP, MainFileID, Consumer, Stats); + ParseAST(PP, Consumer, Stats); } if (Stats) { @@ -1062,8 +1061,7 @@ static void ProcessSerializedFile(const std::string& InFile, Diagnostic& Diag, exit (1); } - // FIXME: only work on consumers that do not require MainFileID. - Consumer->Initialize(*TU->getContext(), 0); + Consumer->Initialize(*TU->getContext()); for (TranslationUnit::iterator I=TU->begin(), E=TU->end(); I!=E; ++I) Consumer->HandleTopLevelDecl(*I); diff --git a/clang/Driver/clang.h b/clang/Driver/clang.h index 77ce59ed1c50..d6b7179b127e 100644 --- a/clang/Driver/clang.h +++ b/clang/Driver/clang.h @@ -27,18 +27,17 @@ class IdentifierTable; class SourceManager; /// DoPrintPreprocessedInput - Implement -E mode. -void DoPrintPreprocessedInput(unsigned MainFileID, Preprocessor &PP); +void DoPrintPreprocessedInput(Preprocessor &PP); /// CreatePrintParserActionsAction - Return the actions implementation that /// implements the -parse-print-callbacks option. MinimalAction *CreatePrintParserActionsAction(IdentifierTable &); /// EmitLLVMFromASTs - Implement -emit-llvm, which generates llvm IR from C. -void EmitLLVMFromASTs(Preprocessor &PP, unsigned MainFileID, - bool PrintStats); +void EmitLLVMFromASTs(Preprocessor &PP, bool PrintStats); /// CheckASTConsumer - Implement diagnostic checking for AST consumers. -bool CheckASTConsumer(Preprocessor &PP, unsigned MainFileID, ASTConsumer* C); +bool CheckASTConsumer(Preprocessor &PP, ASTConsumer* C); } // end namespace clang diff --git a/clang/Lex/Preprocessor.cpp b/clang/Lex/Preprocessor.cpp index fb4628be7128..a7880fa7fcb4 100644 --- a/clang/Lex/Preprocessor.cpp +++ b/clang/Lex/Preprocessor.cpp @@ -431,7 +431,10 @@ static void InitializePredefinedMacros(Preprocessor &PP, /// EnterMainSourceFile - Enter the specified FileID as the main source file, /// which implicitly adds the builting defines etc. -void Preprocessor::EnterMainSourceFile(unsigned MainFileID) { +void Preprocessor::EnterMainSourceFile() { + + unsigned MainFileID = SourceMgr.getMainFileID(); + // Enter the main file source buffer. EnterSourceFile(MainFileID, 0); diff --git a/clang/Sema/ASTStreamer.cpp b/clang/Sema/ASTStreamer.cpp index b51874ca354c..b6b63004135e 100644 --- a/clang/Sema/ASTStreamer.cpp +++ b/clang/Sema/ASTStreamer.cpp @@ -25,9 +25,10 @@ namespace { class ASTStreamer { Parser P; public: - ASTStreamer(Preprocessor &pp, ASTContext &ctxt, unsigned MainFileID) + ASTStreamer(Preprocessor &pp, ASTContext &ctxt) : P(pp, *new Sema(pp, ctxt)) { - pp.EnterMainSourceFile(MainFileID); + + pp.EnterMainSourceFile(); // Initialize the parser. P.Initialize(); @@ -73,8 +74,7 @@ void ASTStreamer::PrintStats() const { /// ParseAST - Parse the entire file specified, notifying the ASTConsumer as /// the file is parsed. This takes ownership of the ASTConsumer and /// ultimately deletes it. -void clang::ParseAST(Preprocessor &PP, unsigned MainFileID, - ASTConsumer *Consumer, bool PrintStats) { +void clang::ParseAST(Preprocessor &PP, ASTConsumer *Consumer, bool PrintStats) { // Collect global stats on Decls/Stmts (until we have a module streamer). if (PrintStats) { Decl::CollectingStats(true); @@ -84,9 +84,9 @@ void clang::ParseAST(Preprocessor &PP, unsigned MainFileID, ASTContext Context(PP.getSourceManager(), PP.getTargetInfo(), PP.getIdentifierTable(), PP.getSelectorTable()); - ASTStreamer Streamer(PP, Context, MainFileID); + ASTStreamer Streamer(PP, Context); - Consumer->Initialize(Context, MainFileID); + Consumer->Initialize(Context); while (Decl *D = Streamer.ReadTopLevelDecl()) Consumer->HandleTopLevelDecl(D); diff --git a/clang/include/clang/AST/ASTConsumer.h b/clang/include/clang/AST/ASTConsumer.h index 7221ab789b33..f0bc07dd34a9 100644 --- a/clang/include/clang/AST/ASTConsumer.h +++ b/clang/include/clang/AST/ASTConsumer.h @@ -26,8 +26,8 @@ public: virtual ~ASTConsumer(); /// Initialize - This is called to initialize the consumer, providing the - /// ASTContext and the file ID of the primary file. - virtual void Initialize(ASTContext &Context, unsigned MainFileID) {} + /// ASTContext. + virtual void Initialize(ASTContext &Context) {} /// HandleTopLevelDecl - Handle the specified top-level declaration. This is /// called by HandleTopLevelDeclaration to process every top-level Decl*. diff --git a/clang/include/clang/Lex/Preprocessor.h b/clang/include/clang/Lex/Preprocessor.h index 0ad83f71f663..59e88716df8e 100644 --- a/clang/include/clang/Lex/Preprocessor.h +++ b/clang/include/clang/Lex/Preprocessor.h @@ -217,8 +217,7 @@ public: /// EnterMainSourceFile - Enter the specified FileID as the main source file, /// which implicitly adds the builtin defines etc. - void EnterMainSourceFile(unsigned CurFileID); - + void EnterMainSourceFile(); /// EnterSourceFile - Add a source file to the top of the include stack and /// start lexing tokens from it instead of the current buffer. If isMainFile diff --git a/clang/include/clang/Sema/ASTStreamer.h b/clang/include/clang/Sema/ASTStreamer.h index bffc4db9939e..5e9b65996f4f 100644 --- a/clang/include/clang/Sema/ASTStreamer.h +++ b/clang/include/clang/Sema/ASTStreamer.h @@ -23,8 +23,7 @@ namespace clang { /// ParseAST - Parse the entire file specified, notifying the ASTConsumer as /// the file is parsed. This takes ownership of the ASTConsumer and /// ultimately deletes it. - void ParseAST(Preprocessor &pp, unsigned MainFileID, - ASTConsumer *C, bool PrintStats = false); + void ParseAST(Preprocessor &pp, ASTConsumer *C, bool PrintStats = false); } // end namespace clang #endif