Make CheckerFrontendWithBugType a subclass of BugType

Author: NagyDonat

clang/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h

@@ -77,15 +77,12 @@ class BugType {
 ///   BugType LongCheckerFrontendNameBug{LongCheckerFrontendName, "..."};
 /// ```
 /// we can use `CheckerFrontendWithBugType LongCheckerFrontendName{"..."}`.
-class CheckerFrontendWithBugType : public CheckerFrontend {
-  BugType BT;
-
+class CheckerFrontendWithBugType : public CheckerFrontend, public BugType {
 public:
   CheckerFrontendWithBugType(StringRef Desc,
                              StringRef Cat = categories::LogicError,
                              bool SuppressOnSink = false)
-      : BT(this, Desc, Cat, SuppressOnSink) {}
-  const BugType &getBT() const { return BT; }
+      : BugType(this, Desc, Cat, SuppressOnSink) {}
 };
 
 } // namespace ento

clang/lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp

@@ -56,8 +56,8 @@ void DivZeroChecker::reportBug(StringRef Msg, ProgramStateRef StateZero,
   if (!DivideZeroChecker.isEnabled())
     return;
   if (ExplodedNode *N = C.generateErrorNode(StateZero)) {
-    auto R = std::make_unique<PathSensitiveBugReport>(DivideZeroChecker.getBT(),
-                                                      Msg, N);
+    auto R =
+        std::make_unique<PathSensitiveBugReport>(DivideZeroChecker, Msg, N);
     bugreporter::trackExpressionValue(N, getDenomExpr(N), *R);
     C.emitReport(std::move(R));
   }
@@ -69,8 +69,8 @@ void DivZeroChecker::reportTaintBug(
   if (!TaintedDivChecker.isEnabled())
     return;
   if (ExplodedNode *N = C.generateNonFatalErrorNode(StateZero)) {
-    auto R = std::make_unique<PathSensitiveBugReport>(TaintedDivChecker.getBT(),
-                                                      Msg, N);
+    auto R =
+        std::make_unique<PathSensitiveBugReport>(TaintedDivChecker, Msg, N);
     bugreporter::trackExpressionValue(N, getDenomExpr(N), *R);
     for (auto Sym : TaintedSyms)
       R->markInteresting(Sym);

clang/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp

@@ -155,8 +155,7 @@ void VirtualCallChecker::checkPreCall(const CallEvent &Call,
     return;
   }
 
-  auto Report =
-      std::make_unique<PathSensitiveBugReport>(Part.getBT(), OS.str(), N);
+  auto Report = std::make_unique<PathSensitiveBugReport>(Part, OS.str(), N);
 
   if (ShowFixIts && !IsPure) {
     // FIXME: These hints are valid only when the virtual call is made