fixes

Author: jsinglet

c/cert/src/rules/CON40-C/AtomicVariableTwiceInExpression.ql

@@ -14,6 +14,7 @@
 
 import cpp
 import codingstandards.c.cert
+import codingstandards.cpp.Concurrency
 
 from MacroInvocation mi, Variable v, Locatable whereFound
 where
@@ -22,13 +23,13 @@ where
     // There isn't a way to safely use this construct in a way that is also
     // possible the reliably detect so advise against using it.
     (
-      mi.getMacroName() = ["atomic_store", "atomic_store_explicit"]
+      mi instanceof AtomicStore
       or
       // This construct is generally safe, but must be used in a loop. To lower
       // the false positive rate we don't look at the conditions of the loop and
       // instead assume if it is found in a looping construct that it is likely
       // related to the safety property.
-      mi.getMacroName() = ["atomic_compare_exchange_weak", "atomic_compare_exchange_weak_explicit"] and
+      mi instanceof AtomicCompareExchange and
       not exists(Loop l | mi.getAGeneratedElement().(Expr).getParent*() = l)
     ) and
     whereFound = mi

c/cert/src/rules/CON41-C/WrapFunctionsThatCanFailSpuriouslyInLoop.ql

@@ -12,28 +12,18 @@
  *       external/cert/obligation/rule
  */
 
-import cpp
-import codingstandards.c.cert
+ import cpp
+ import codingstandards.c.cert
+ import codingstandards.cpp.Concurrency
+ 
 
-/**
- * Models calls to routines in the `stdatomic` library. Note that these
- * are typically implemented as macros within Clang and GCC's standard
- * libraries.
- */
-class SpuriouslyFailingFunctionCallType extends MacroInvocation {
-  SpuriouslyFailingFunctionCallType() {
-    getMacroName() = ["atomic_compare_exchange_weak", "atomic_compare_exchange_weak_explicit"]
-  }
-}
-
-from SpuriouslyFailingFunctionCallType fc
-where
-  not isExcluded(fc, Concurrency3Package::wrapFunctionsThatCanFailSpuriouslyInLoopQuery()) and
-  (
-    exists(StmtParent sp | sp = fc.getStmt() and not sp.(Stmt).getParentStmt*() instanceof Loop)
-    or
-    exists(StmtParent sp |
-      sp = fc.getExpr() and not sp.(Expr).getEnclosingStmt().getParentStmt*() instanceof Loop
-    )
-  )
-select fc, "Function that can spuriously fail not wrapped in a loop."
+ from AtomicCompareExchange ace
+ where
+   not isExcluded(ace, Concurrency3Package::wrapFunctionsThatCanFailSpuriouslyInLoopQuery()) and
+   (
+    forex(StmtParent sp | sp = ace.getStmt() | not sp.(Stmt).getParentStmt*() instanceof Loop) or
+    forex(Expr e | e = ace.getExpr() | not e.getEnclosingStmt().getParentStmt*()
+    instanceof Loop)
+   )
+ select ace, "Function that can spuriously fail not wrapped in a loop."
+