Add missing check for access modifier in UnnecessaryMutableChecker; f…

…ix reported location
cms-sw · Dec 19, 2024 · 17d0074 · 17d0074
1 parent 63d4310
commit 17d0074
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/Utilities/StaticAnalyzers/src/UnnecessaryMutableChecker.cpp b/Utilities/StaticAnalyzers/src/UnnecessaryMutableChecker.cpp
@@ -46,6 +46,12 @@ namespace clangcms {
       if (!Field->isMutable()) {
         continue;
       }
+
+      // == Skip non-public mutables, we deal with them elsewhere
+      if (Field->getAccess() != clang::AS_public) {
+        return;
+      }
+
       // == Skip atmoic mutables, these are thread-safe by design ==
       if (support::isStdAtomic(Field)) {
         return;  // Skip if it's a mutable std::atomic
@@ -64,16 +70,17 @@ namespace clangcms {
       if (!isMutableMemberModified(Field, RD)) {
         clang::SourceLocation Loc = Field->getLocation();
         if (Loc.isValid()) {
+          clang::ento::PathDiagnosticLocation FieldLoc(Loc, SM);
           if (!BT) {
             BT = std::make_unique<clang::ento::BugType>(this, "Unnecessarily Mutable Member", "Coding Practices");
           }
-          BR.EmitBasicReport(
-              Field,
-              this,
-              "Useless mutable field",
-              "ConstThreadSafety",
-              "The mutable field '" + Field->getQualifiedNameAsString() + "' is not modified in any const methods",
-              PathLoc);
+          BR.EmitBasicReport(Field,
+                             this,
+                             "Useless mutable field",
+                             "ConstThreadSafety",
+                             "The mutable field '" + Field->getQualifiedNameAsString() +
+                                 "' is not modified in any public const methods",
+                             FieldLoc);
         }
       }
     }