use SemaConsumer instead of ASTConsumer

Author: sdkrystian

source/AST/ASTVisitor.cpp

@@ -1625,9 +1625,10 @@ ASTVisitor::
 HandleTranslationUnit(
     ASTContext& Context)
 {
-    // cache contextual variables
-    astContext_ = &Context;
-    sourceManager_ = &astContext_->getSourceManager();
+    // the ASTContext and Sema better be the same
+    // as those set by Initialize and InitializeSema
+    Assert(astContext_ == &Context);
+    Assert(sema_);
 
     // Install handlers for our custom commands
     initCustomCommentCommands(Context);
@@ -1644,8 +1645,6 @@ HandleTranslationUnit(
     if(! config_.shouldVisitTU(File_))
         return;
 
-    sema_ = &compiler_.getSema();
-
     TranslationUnitDecl* TU =
         Context.getTranslationUnitDecl();
     // the traversal scope should *only* consist of the
@@ -1659,5 +1658,29 @@ HandleTranslationUnit(
         TraverseDecl(C);
 }
 
+void
+ASTVisitor::
+Initialize(ASTContext& Context)
+{
+    astContext_ = &Context;
+    sourceManager_ = &Context.getSourceManager();
+}
+
+void
+ASTVisitor::
+InitializeSema(Sema& S)
+{
+    // Sema should not have been initialized yet
+    Assert(! sema_);
+    sema_ = &S;
+}
+
+void
+ASTVisitor::
+ForgetSema()
+{
+    sema_ = nullptr;
+}
+
 } // mrdox
 } // clang

source/AST/ASTVisitor.hpp

@@ -15,6 +15,7 @@
 
 #include "ConfigImpl.hpp"
 #include <mrdox/MetadataFwd.hpp>
+#include <clang/Sema/SemaConsumer.h>
 #include <clang/Tooling/Execution.h>
 #include <optional>
 #include <unordered_map>
@@ -35,7 +36,7 @@ namespace mrdox {
     more than one translation unit.
 */
 class ASTVisitor
-    : public ASTConsumer
+    : public SemaConsumer
 {
 public:
     struct FileFilter
@@ -52,14 +53,15 @@ class ASTVisitor
 
     llvm::SmallString<128> usr_;
 
-    ASTContext* astContext_;
-    clang::SourceManager const* sourceManager_;
     std::unordered_map<
         clang::SourceLocation::UIntTy,
         FileFilter> fileFilter_;
 
     clang::CompilerInstance& compiler_;
-    Sema* sema_;
+
+    ASTContext* astContext_ = nullptr;
+    SourceManager* sourceManager_ = nullptr;
+    Sema* sema_ = nullptr;
 
 public:
     ASTVisitor(
@@ -274,7 +276,6 @@ class ASTVisitor
 
     void HandleTranslationUnit(ASTContext& Context) override;
 
-
     /** Skip function bodies
 
         This is called by Sema when parsing a function that has a body and:
@@ -286,6 +287,11 @@ class ASTVisitor
         nor one that introduces a new type via returning a local class.
     */
     bool shouldSkipFunctionBody(Decl* D) override { return true; }
+
+    void Initialize(ASTContext& Context) override;
+    void InitializeSema(Sema& S) override;
+    void ForgetSema() override;
+
 };
 
 } // mrdox