StaticAnalyzer fixes for clang 21

Author: smuzaffar

TauAnalysis/MCEmbeddingTools/plugins/MuonDetCleaner.cc

@@ -256,7 +256,8 @@ uint32_t MuonDetCleaner<RPCDetId, RPCRecHit>::getRawDetId(const RPCRecHit &recHi
 
 template <typename T1, typename T2>
 bool MuonDetCleaner<T1, T2>::checkrecHit(const TrackingRecHit &recHit) {
-  edm::LogError("TauEmbedding") << "!!!! Please add the checkrecHit for the individual class templates " assert(0);
+  edm::LogError("TauEmbedding") << "!!!! Please add the checkrecHit for the individual class templates ";
+  assert(0);
 }
 
 template <>
@@ -335,4 +336,4 @@ DEFINE_FWK_MODULE(CSCRecHitColCleaner);
 DEFINE_FWK_MODULE(DTRecHitColCleaner);
 DEFINE_FWK_MODULE(RPCRecHitColCleaner);
 DEFINE_FWK_MODULE(CSCSegmentColCleaner);
-DEFINE_FWK_MODULE(DTRecSegment4DColCleaner);
+DEFINE_FWK_MODULE(DTRecSegment4DColCleaner);

Utilities/StaticAnalyzers/src/CmsSupport.cpp

@@ -54,7 +54,11 @@ std::string clangcms::support::getQualifiedName(const clang::NamedDecl &d) {
   LangOpts.CPlusPlus = true;
   PrintingPolicy Policy(LangOpts);
   Policy.FullyQualifiedName = true;
+#if LLVM_VERSION_MAJOR >= 21
+  Policy.PrintAsCanonical = true;
+#else
   Policy.PrintCanonicalTypes = true;
+#endif
   const DeclContext *ctx = d.getDeclContext();
   if (ctx->isFunctionOrMethod() && isa<NamedDecl>(ctx)) {
     // This is a local variable.
@@ -177,14 +181,21 @@ bool clangcms::support::isDataClass(const std::string &name) {
     const std::string tname("/src/Utilities/StaticAnalyzers/scripts/bloom.bin");
     const std::string fname1 = lname + tname;
     const std::string fname2 = rname + tname;
-    if (!(FM.getFile(fname1) || FM.getFile(fname2))) {
+#if LLVM_VERSION_MAJOR >= 21
+    auto FE1 = FM.getFileRef(fname1);
+    auto FE2 = FM.getFileRef(fname2);
+#else
+    auto FE1 = FM.getFile(fname1);
+    auto FE2 = FM.getFile(fname2);
+#endif
+    if (FE1) {
+      iname = fname1;
+    } else if (FE2) {
+      iname = fname2;
+    } else {
       llvm::errs() << "\n\nChecker cannot find bloom filter file" << fname1 << " or " << fname2 << "\n\n\n";
       exit(1);
     }
-    if (FM.getFile(fname1))
-      iname = fname1;
-    else
-      iname = fname2;
   }
 
   CMS_SA_ALLOW static scaling_bloom_t *blmflt = new_scaling_bloom_from_file(CAPACITY, ERROR_RATE, iname.c_str());

Utilities/StaticAnalyzers/src/FunctionChecker.cpp

@@ -107,7 +107,11 @@ namespace clangcms {
       llvm::raw_string_ostream os(buf);
       os << "function '" << dname << "' accesses or modifies non-const static local variable '" << svname << "'.\n";
       BR.EmitBasicReport(D,
+#if LLVM_VERSION_MAJOR >= 21
+                         Checker->getName(),
+#else
                          Checker->getCheckerName(),
+#endif
                          "non-const static local variable accessed or modified",
                          "ThreadSafety",
                          os.str(),
@@ -123,7 +127,11 @@ namespace clangcms {
       os << "function '" << dname << "' accesses or modifies non-const static member data variable '" << svname
          << "'.\n";
       BR.EmitBasicReport(D,
+#if LLVM_VERSION_MAJOR >= 21
+                         Checker->getName(),
+#else
                          Checker->getCheckerName(),
+#endif
                          "non-const static local variable accessed or modified",
                          "ThreadSafety",
                          os.str(),
@@ -138,7 +146,11 @@ namespace clangcms {
       llvm::raw_string_ostream os(buf);
       os << "function '" << dname << "' accesses or modifies non-const global static variable '" << svname << "'.\n";
       BR.EmitBasicReport(D,
+#if LLVM_VERSION_MAJOR >= 21
+                         Checker->getName(),
+#else
                          Checker->getCheckerName(),
+#endif
                          "non-const static local variable accessed or modified",
                          "ThreadSafety",
                          os.str(),
@@ -178,8 +190,16 @@ namespace clangcms {
               "'COMMONBLOCK'.\n";
         clang::ento::PathDiagnosticLocation FDLoc =
             clang::ento::PathDiagnosticLocation::createBegin(FD, BR.getSourceManager());
-        BR.EmitBasicReport(
-            FD, this->getCheckerName(), "COMMONBLOCK variable accessed or modified", "ThreadSafety", os.str(), FDLoc);
+        BR.EmitBasicReport(FD,
+#if LLVM_VERSION_MAJOR >= 21
+                           this->getName(),
+#else
+                           this->getCheckerName(),
+#endif
+                           "COMMONBLOCK variable accessed or modified",
+                           "ThreadSafety",
+                           os.str(),
+                           FDLoc);
         std::string ostring = "function '" + dname + "' static variable 'COMMONBLOCK'.\n";
         std::string tname = "function-checker.txt.unsorted";
         support::writeLog(ostring, tname);