Merge commit 'fddf627461e88c0a824b36b770497be3a370eb3d' into codeql/upgrade-to-2.13.5

Author: lcartey

c/cert/src/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.ql

@@ -163,8 +163,8 @@ Type compatibleTypes(Type type) {
     (
       type.stripType() instanceof Struct and
       type.getUnspecifiedType() = result.getUnspecifiedType() and
-      not type.getName() = "struct <unnamed>" and
-      not result.getName() = "struct <unnamed>"
+      not type.(Struct).isAnonymous() and
+      not result.(Struct).isAnonymous()
       or
       not type.stripType() instanceof Struct and
       (

c/cert/src/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.ql

@@ -89,7 +89,7 @@ module TaintedPathConfiguration implements DataFlow::ConfigSig {
   }
 }
 
-module TaintedPath = TaintTracking::Make<TaintedPathConfiguration>;
+module TaintedPath = TaintTracking::Global<TaintedPathConfiguration>;
 
 from
   FileFunction fileFunction, Expr taintedArg, FlowSource taintSource,
@@ -98,7 +98,7 @@ where
   not isExcluded(taintedArg, IO3Package::doNotPerformFileOperationsOnDevicesQuery()) and
   taintedArg = sinkNode.getNode().asIndirectArgument() and
   fileFunction.outermostWrapperFunctionCall(taintedArg, callChain) and
-  TaintedPath::hasFlowPath(sourceNode, sinkNode) and
+  TaintedPath::flowPath(sourceNode, sinkNode) and
   taintSource = sourceNode.getNode()
 select taintedArg, sourceNode, sinkNode,
   "This argument to a file access function is derived from $@ and then passed to " + callChain + ".",

c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected

@@ -53,8 +53,8 @@ subpaths
 | test.c:13:17:13:19 | & ... | test.c:13:17:13:19 | & ... | test.c:13:17:13:19 | & ... | Cast from short[2] to short[4] results in an incompatible pointer base type. |
 | test.c:19:18:19:20 | & ... | test.c:19:18:19:20 | & ... | test.c:19:18:19:20 | & ... | Cast from char to signed char results in an incompatible pointer base type. |
 | test.c:30:19:30:21 | & ... | test.c:30:19:30:21 | & ... | test.c:30:19:30:21 | & ... | Cast from int to unsigned int results in an incompatible pointer base type. |
-| test.c:47:8:47:9 | s2 | test.c:47:8:47:9 | s2 | test.c:47:8:47:9 | s2 | Cast from struct <unnamed> to struct <unnamed> results in an incompatible pointer base type. |
-| test.c:49:8:49:9 | s3 | test.c:49:8:49:9 | s3 | test.c:49:8:49:9 | s3 | Cast from S1 to struct <unnamed> results in an incompatible pointer base type. |
-| test.c:50:8:50:9 | s1 | test.c:50:8:50:9 | s1 | test.c:50:8:50:9 | s1 | Cast from struct <unnamed> to S1 results in an incompatible pointer base type. |
+| test.c:47:8:47:9 | s2 | test.c:47:8:47:9 | s2 | test.c:47:8:47:9 | s2 | Cast from (unnamed class/struct/union) to (unnamed class/struct/union) results in an incompatible pointer base type. |
+| test.c:49:8:49:9 | s3 | test.c:49:8:49:9 | s3 | test.c:49:8:49:9 | s3 | Cast from S1 to (unnamed class/struct/union) results in an incompatible pointer base type. |
+| test.c:50:8:50:9 | s1 | test.c:50:8:50:9 | s1 | test.c:50:8:50:9 | s1 | Cast from (unnamed class/struct/union) to S1 results in an incompatible pointer base type. |
 | test.c:68:41:68:41 | v | test.c:72:13:72:15 | & ... | test.c:68:41:68:41 | v | Cast from float to int results in an incompatible pointer base type. |
 | test.c:99:3:99:4 | s3 | test.c:98:40:98:41 | s2 | test.c:99:3:99:4 | s3 | Cast from S2 to S3 results in an incompatible pointer base type. |

c/common/test/rules/informationleakageacrossboundaries/InformationLeakageAcrossBoundaries.expected

@@ -5,7 +5,7 @@
 | interprocedural.c:104:9:104:9 | p | 'p' may leak information from {x (interprocedural.c:7), y (interprocedural.c:8)}. Path: p (interprocedural.c:104) --> overwrite_after_leak(...) (interprocedural.c:96) --> p (interprocedural.c:97) |
 | multilayer.c:16:10:16:10 | s | 's' may leak information from {b (multilayer.c:12)}. Path: s (multilayer.c:16) --> & ... (multilayer.c:18) |
 | multilayer.c:29:10:29:10 | s | 's' may leak information from {b (multilayer.c:12), x (multilayer.c:7)}. Path: s (multilayer.c:29) --> & ... (multilayer.c:30) |
-| multilayer.c:34:8:34:8 | s | 's' may leak information from {struct <unnamed> (multilayer.c:6)}. Path: s (multilayer.c:34) --> & ... (multilayer.c:35) |
+| multilayer.c:34:8:34:8 | s | 's' may leak information from {(unnamed class/struct/union) (multilayer.c:6)}. Path: s (multilayer.c:34) --> & ... (multilayer.c:35) |
 | test.c:12:12:12:12 | s | 's' may leak information from {y (test.c:8)}. Path: s (test.c:12) --> & ... (test.c:14) |
 | test.c:18:12:18:12 | s | 's' may leak information from {x (test.c:7)}. Path: s (test.c:18) --> & ... (test.c:20) |
 | test.c:24:12:24:12 | s | 's' may leak information from {x (test.c:7), y (test.c:8)}. Path: s (test.c:24) --> & ... (test.c:25) |

c/common/test/rules/unusedtypedeclarations/UnusedTypeDeclarations.expected

@@ -1,4 +1,4 @@
 | test.c:4:8:4:8 | A | Type declaration A is not used. |
 | test.c:7:18:7:18 | D | Type declaration D is not used. |
 | test.c:28:11:28:11 | R | Type declaration R is not used. |
-| test.c:41:12:41:12 | struct <unnamed> | Type declaration struct <unnamed> is not used. |
+| test.c:41:12:41:12 | (unnamed class/struct/union) | Type declaration (unnamed class/struct/union) is not used. |

c/common/test/rules/useinitializerbracestomatchaggregatetypestructure/UseInitializerBracesToMatchAggregateTypeStructure.expected

@@ -3,5 +3,5 @@
 | test.c:35:32:35:35 | {...} | Missing braces on aggregate literal of type int[2]$@ which is assigned to index 2 in $@. | file://:0:0:0:0 | int[2] | int[2] | test.c:35:18:35:42 | {...} | array of type int[4][2] |
 | test.c:35:38:35:41 | {...} | Missing braces on aggregate literal of type int[2]$@ which is assigned to index 3 in $@. | file://:0:0:0:0 | int[2] | int[2] | test.c:35:18:35:42 | {...} | array of type int[4][2] |
 | test.c:41:34:41:34 | {...} | Missing braces on aggregate literal of type int[2]$@ which is assigned to index 1 in $@. | file://:0:0:0:0 | int[2] | int[2] | test.c:41:18:41:35 | {...} | array of type int[2][2] |
-| test.c:47:26:47:29 | {...} | Missing braces on aggregate literal of type $@ which is assigned to field $@. | test.c:4:10:4:10 | struct <unnamed> | struct <unnamed> | test.c:7:5:7:8 | m_s1 | m_s1 |
-| test.c:47:26:47:29 | {...} | Missing braces on aggregate literal of type $@ which is assigned to field $@. | test.c:11:10:11:10 | struct <unnamed> | struct <unnamed> | test.c:7:5:7:8 | m_s1 | m_s1 |
+| test.c:47:26:47:29 | {...} | Missing braces on aggregate literal of type $@ which is assigned to field $@. | test.c:4:10:4:10 | (unnamed class/struct/union) | (unnamed class/struct/union) | test.c:7:5:7:8 | m_s1 | m_s1 |
+| test.c:47:26:47:29 | {...} | Missing braces on aggregate literal of type $@ which is assigned to field $@. | test.c:11:10:11:10 | (unnamed class/struct/union) | (unnamed class/struct/union) | test.c:7:5:7:8 | m_s1 | m_s1 |

c/misra/src/codingstandards/c/misra/EssentialTypes.qll

@@ -404,12 +404,12 @@ predicate isAssignmentToEssentialType(Type lValueEssentialType, Expr rValue) {
   // Initializing an array
   exists(ArrayAggregateLiteral aal |
     lValueEssentialType = aal.getElementType() and
-    rValue = aal.getElementExpr(_)
+    rValue = aal.getAnElementExpr(_)
   )
   or
   // Initializing a struct or union
   exists(ClassAggregateLiteral cal, Field field |
     lValueEssentialType = field.getType() and
-    rValue = cal.getFieldExpr(field)
+    rValue = cal.getAFieldExpr(field)
   )
 }

c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql

@@ -25,8 +25,8 @@ from AggregateLiteral initList, SideEffect effect
 where
   not isExcluded(initList, SideEffects1Package::initializerListsContainPersistentSideEffectsQuery()) and
   (
-    initList.(ArrayOrVectorAggregateLiteral).getElementExpr(_) = effect
+    initList.(ArrayOrVectorAggregateLiteral).getAnElementExpr(_) = effect
     or
-    initList.(ClassAggregateLiteral).getFieldExpr(_) = effect
+    initList.(ClassAggregateLiteral).getAFieldExpr(_) = effect
   )
 select initList, "Initializer list constains persistent $@", effect, "side effect"

c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql

@@ -20,7 +20,7 @@ from UserType s
 where
   not isExcluded(s, DeadCodePackage::unusedTagDeclarationQuery()) and
   // ignore structs without a tag name
-  not s.getName() = "struct <unnamed>" and
+  not s.isAnonymous() and
   // typedefs do not have a "tag" name, so this rule does not apply to them
   not s instanceof TypedefType and
   // Not mentioned anywhere

c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql

@@ -30,7 +30,7 @@ class NullTerminatedStringToMemcmpConfiguration extends TaintTracking::Configura
       // The array element type is an essentially character type
       getEssentialTypeCategory(aal.getElementType()) = EssentiallyCharacterType() and
       // Includes a null terminator somewhere in the array initializer
-      aal.getElementExpr(_).getValue().toInt() = 0
+      aal.getAnElementExpr(_).getValue().toInt() = 0
     |
       // For local variables, use the array aggregate literal as the source
       aal = source.asExpr()