Merge pull request #40310 from gartung/gartung-SA-constcast-assert-fix

Utilities/StaticAnalysers: Fix assert in ConstCast and ConstCastAway checkers.
cms-sw · Dec 14, 2022 · 52c0dac · 52c0dac
2 parents 44827dc + 733719d
commit 52c0dac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/Utilities/StaticAnalyzers/src/ConstCastAwayChecker.cpp b/Utilities/StaticAnalyzers/src/ConstCastAwayChecker.cpp
@@ -8,6 +8,7 @@
 #include <clang/AST/ExprCXX.h>
 #include <clang/AST/Attr.h>
 #include <clang/AST/ParentMap.h>
+#include <clang/AST/Stmt.h>
 
 #include <memory>
 
@@ -35,9 +36,13 @@ namespace clangcms {
     }
     if (P && isa<DeclStmt>(P)) {
       const DeclStmt *DS = dyn_cast_or_null<DeclStmt>(P);
-      if (DS && (hasSpecificAttr<CMSSaAllowAttr>(DS->getSingleDecl()->getAttrs()) ||
-                 hasSpecificAttr<CMSThreadSafeAttr>(DS->getSingleDecl()->getAttrs())))
-        return;
+      if (DS) {
+        for (auto D : DS->decls()) {
+          if (hasSpecificAttr<CMSSaAllowAttr>(D->getAttrs()) || hasSpecificAttr<CMSThreadSafeAttr>(D->getAttrs())) {
+            return;
+          }
+        }
+      }
     }
 
     const Expr *SE = CE->getSubExpr();

diff --git a/Utilities/StaticAnalyzers/src/ConstCastChecker.cpp b/Utilities/StaticAnalyzers/src/ConstCastChecker.cpp
@@ -32,9 +32,13 @@ namespace clangcms {
     }
     if (P && isa<DeclStmt>(P)) {
       const DeclStmt *DS = dyn_cast_or_null<DeclStmt>(P);
-      if (DS && (hasSpecificAttr<CMSSaAllowAttr>(DS->getSingleDecl()->getAttrs()) ||
-                 hasSpecificAttr<CMSThreadSafeAttr>(DS->getSingleDecl()->getAttrs())))
-        return;
+      if (DS) {
+        for (auto D : DS->decls()) {
+          if (hasSpecificAttr<CMSSaAllowAttr>(D->getAttrs()) || hasSpecificAttr<CMSThreadSafeAttr>(D->getAttrs())) {
+            return;
+          }
+        }
+      }
     }
 
     const Expr *SE = CE->getSubExprAsWritten();