Use SourceManager from MatchFinder::MatchResult

Author: sawenzel

reporting/InterfaceLister.cpp

@@ -34,7 +34,7 @@ void InterfaceLister::check(const MatchFinder::MatchResult &Result) {
       return;
 
     std::string sourceInfo(MatchedCallExpr->getExprLoc().printToString(
-        MyContext->getSourceManager()));
+        *Result.SourceManager));
     std::cerr << sourceInfo << " ; " << ClassName << " : "
               << MatchedCallExpr->getMethodDecl()->getQualifiedNameAsString()
               << "\n";

reporting/InterfaceLister.h

@@ -23,10 +23,9 @@ class InterfaceLister : public ClangTidyCheck {
 private:
   const std::string ClassName; // the class name for which we want to find
                          // used interfaces
-  ClangTidyContext * MyContext;
 public:
   InterfaceLister(StringRef Name, ClangTidyContext *Context)
-      : ClangTidyCheck(Name, Context), ClassName(Options.get("ClassName", "")), MyContext(Context) {}
+      : ClangTidyCheck(Name, Context), ClassName(Options.get("ClassName", "")) {}
 
   void storeOptions(ClangTidyOptions::OptionMap &Opts) override {
     Options.store(Opts, "ClassName", ClassName);

reporting/VirtFuncLister.cpp

@@ -23,6 +23,7 @@ void VirtFuncLister::registerMatchers(MatchFinder *Finder) {
 }
 
 void VirtFuncLister::check(const MatchFinder::MatchResult &Result) {
+  const auto &SM = *Result.SourceManager;
   const auto *MatchedDecl =
       Result.Nodes.getNodeAs<CXXMethodDecl>("method");
   if (MatchedDecl) {
@@ -47,7 +48,7 @@ void VirtFuncLister::check(const MatchFinder::MatchResult &Result) {
 
         if (iter == enditer) {
           SourceLocation loc = MatchedDecl->getLocStart();//getLocation();
-          loc.dump(MyContext->getSourceManager());
+          loc.dump(SM);
           llvm::errs() << "VIRTUAL-START-DECLARATION \n";
         } else {
           // otherwise find the base this is referring to
@@ -69,10 +70,10 @@ void VirtFuncLister::check(const MatchFinder::MatchResult &Result) {
             iter = (*iter)->begin_overridden_methods();
           }
           SourceLocation loc = (*lastiter)->getLocStart();//getLocation();
-          loc.dump(MyContext->getSourceManager());
+          loc.dump(SM);
           llvm::errs() << " OVERRIDEN-AT ";
           loc = MatchedDecl->getLocStart();//getLocation();
-          loc.dump(MyContext->getSourceManager());
+          loc.dump(SM);
           llvm::errs() << "\n";
         }
       }

reporting/VirtFuncLister.h

@@ -20,11 +20,9 @@ namespace reporting {
 /// used in the code base
 ///
 class VirtFuncLister : public ClangTidyCheck {
-private:
-  ClangTidyContext * MyContext;
 public:
   VirtFuncLister(StringRef Name, ClangTidyContext *Context)
-      : ClangTidyCheck(Name, Context), MyContext(Context) {}
+      : ClangTidyCheck(Name, Context) {}
 
   void registerMatchers(ast_matchers::MatchFinder *Finder) override;
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;