From 0eeb81baac6e82b065c0b03ad28ad1e580e78790 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 12 Aug 2010 20:50:39 +0000 Subject: [PATCH] Add a ParseAST overload that takes a Sema object, so that the caller can create (and hold on to) the Sema object. Also, move Sema-related initialization/finalization with its various consumers and external sources into the Sema constructor and destructor, rather than placing it in ParseAST. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110952 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Sema/ParseAST.h | 4 +++ include/clang/Sema/Sema.h | 5 +++- lib/Sema/ParseAST.cpp | 56 +++++++++++++---------------------- lib/Sema/Sema.cpp | 21 +++++++++++++ 4 files changed, 49 insertions(+), 37 deletions(-) diff --git a/include/clang/Sema/ParseAST.h b/include/clang/Sema/ParseAST.h index f6cff2a023..57d7d0637f 100644 --- a/include/clang/Sema/ParseAST.h +++ b/include/clang/Sema/ParseAST.h @@ -38,6 +38,10 @@ namespace clang { bool CompleteTranslationUnit = true, CodeCompleteConsumer *CompletionConsumer = 0); + /// \brief Parse the main file known to the preprocessor, producing an + /// abstract syntax tree. + void ParseAST(Sema &S, bool PrintStats = false); + } // end namespace clang #endif diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 0d7ac70881..2436f32a98 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -640,7 +640,10 @@ public: Diagnostic &getDiagnostics() const { return Diags; } SourceManager &getSourceManager() const { return SourceMgr; } const TargetAttributesSema &getTargetAttributesSema() const; - + Preprocessor &getPreprocessor() const { return PP; } + ASTContext &getASTContext() const { return Context; } + ASTConsumer &getASTConsumer() const { return Consumer; } + /// \brief Helper class that creates diagnostics with optional /// template instantiation stacks. /// diff --git a/lib/Sema/ParseAST.cpp b/lib/Sema/ParseAST.cpp index 4286b3f7c4..099171e56f 100644 --- a/lib/Sema/ParseAST.cpp +++ b/lib/Sema/ParseAST.cpp @@ -56,64 +56,48 @@ void clang::ParseAST(Preprocessor &PP, ASTConsumer *Consumer, ASTContext &Ctx, bool PrintStats, bool CompleteTranslationUnit, CodeCompleteConsumer *CompletionConsumer) { + Sema S(PP, Ctx, *Consumer, CompleteTranslationUnit, CompletionConsumer); + ParseAST(S, PrintStats); +} + +void clang::ParseAST(Sema &S, bool PrintStats) { // Collect global stats on Decls/Stmts (until we have a module streamer). if (PrintStats) { Decl::CollectingStats(true); Stmt::CollectingStats(true); } - Sema S(PP, Ctx, *Consumer, CompleteTranslationUnit, CompletionConsumer); - Parser P(PP, S); - PP.EnterMainSourceFile(); - - // Initialize the parser. - P.Initialize(); - - Consumer->Initialize(Ctx); - - if (SemaConsumer *SC = dyn_cast(Consumer)) - SC->InitializeSema(S); - - if (ExternalASTSource *External = Ctx.getExternalSource()) { - if (ExternalSemaSource *ExternalSema = - dyn_cast(External)) - ExternalSema->InitializeSema(S); - + Parser P(S.getPreprocessor(), S); + S.getPreprocessor().EnterMainSourceFile(); + + if (ExternalASTSource *External = S.getASTContext().getExternalSource()) External->StartTranslationUnit(Consumer); - } - + Parser::DeclGroupPtrTy ADecl; - + while (!P.ParseTopLevelDecl(ADecl)) { // Not end of file. - // If we got a null return and something *was* parsed, ignore it. This - // is due to a top-level semicolon, an action override, or a parse error - // skipping something. + // If we got a null return and something *was* parsed, ignore it. This + // is due to a top-level semicolon, an action override, or a parse error + // skipping something. if (ADecl) Consumer->HandleTopLevelDecl(ADecl.getAsVal()); }; // Check for any pending objective-c implementation decl. while ((ADecl = P.FinishPendingObjCActions())) Consumer->HandleTopLevelDecl(ADecl.getAsVal()); - + // Process any TopLevelDecls generated by #pragma weak. for (llvm::SmallVector::iterator - I = S.WeakTopLevelDecls().begin(), - E = S.WeakTopLevelDecls().end(); I != E; ++I) + I = S.WeakTopLevelDecls().begin(), + E = S.WeakTopLevelDecls().end(); I != E; ++I) Consumer->HandleTopLevelDecl(DeclGroupRef(*I)); - + // Dump record layouts, if requested. if (PP.getLangOptions().DumpRecordLayouts) DumpRecordLayouts(Ctx); - + Consumer->HandleTranslationUnit(Ctx); - - if (ExternalSemaSource *ESS = - dyn_cast_or_null(Ctx.getExternalSource())) - ESS->ForgetSema(); - - if (SemaConsumer *SC = dyn_cast(Consumer)) - SC->ForgetSema(); - + if (PrintStats) { fprintf(stderr, "\nSTATISTICS:\n"); P.getActions().PrintStats(); diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp index e7f5bb4317..a504ae69a2 100644 --- a/lib/Sema/Sema.cpp +++ b/lib/Sema/Sema.cpp @@ -143,6 +143,18 @@ Sema::Sema(Preprocessor &pp, ASTContext &ctxt, ASTConsumer &consumer, ExprEvalContexts.push_back( ExpressionEvaluationContextRecord(PotentiallyEvaluated, 0)); + + // Tell the AST consumer about this Sema object. + Consumer.Initialize(this); + + // FIXME: Isn't this redundant with the initialization above? + if (SemaConsumer *SC = dyn_cast(&Consumer)) + SC->InitializeSema(*this); + + // Tell the external Sema source about this Sema object. + if (ExternalSemaSource *ExternalSema + = dyn_cast_or_null(Context.getExternalSource())) + ExternalSema->InitializeSema(S) } Sema::~Sema() { @@ -151,6 +163,15 @@ Sema::~Sema() { delete TheTargetAttributesSema; while (!FunctionScopes.empty()) PopFunctionOrBlockScope(); + + // Tell the SemaConsumer to forget about us; we're going out of scope. + if (SemaConsumer *SC = dyn_cast(&Consumer)) + SC->ForgetSema(); + + // Detach from the external Sema source. + if (ExternalSemaSource *ExternalSema + = dyn_cast_or_null(Context.getExternalSource())) + ExternalSema->ForgetSema(); } /// ImpCastExprToType - If Expr is not of type 'Type', insert an implicit cast. -- 2.40.0