SSA: Switch consistency counts to strictcount.

Author: aschackmull

rust/ql/test/query-tests/diagnostics/SsaConsistencyCounts.expected

@@ -1,10 +0,0 @@
-| Definition cannot reach a read | 0 |
-| End of a basic block can be reached by multiple definitions | 0 |
-| Phi has less than 2 immediately prior references | 0 |
-| Phi node has less than two inputs | 0 |
-| Phi read has less than 2 immediately prior references | 0 |
-| Read can be reached from multiple definitions | 0 |
-| Read cannot be reached from a definition | 0 |
-| Read does not have a prior reference | 0 |
-| Read has multiple prior references | 0 |
-| Read is not dominated by a definition | 0 |

shared/ssa/codeql/ssa/Ssa.qll

@@ -1409,52 +1409,54 @@ module Make<
       // total results from all the SSA consistency query predicates.
       type = "Read can be reached from multiple definitions" and
       result =
-        count(Definition def, SourceVariable v, BasicBlock bb, int i | nonUniqueDef(def, v, bb, i))
+        strictcount(Definition def, SourceVariable v, BasicBlock bb, int i |
+          nonUniqueDef(def, v, bb, i)
+        )
       or
       type = "Read cannot be reached from a definition" and
-      result = count(SourceVariable v, BasicBlock bb, int i | readWithoutDef(v, bb, i))
+      result = strictcount(SourceVariable v, BasicBlock bb, int i | readWithoutDef(v, bb, i))
       or
       type = "Definition cannot reach a read" and
-      result = count(Definition def, SourceVariable v | deadDef(def, v))
+      result = strictcount(Definition def, SourceVariable v | deadDef(def, v))
       or
       type = "Read is not dominated by a definition" and
       result =
-        count(Definition def, SourceVariable v, BasicBlock bb, int i |
+        strictcount(Definition def, SourceVariable v, BasicBlock bb, int i |
           notDominatedByDef(def, v, bb, i)
         )
       or
       type = "End of a basic block can be reached by multiple definitions" and
       result =
-        count(Definition def, SourceVariable v, BasicBlock bb |
+        strictcount(Definition def, SourceVariable v, BasicBlock bb |
           nonUniqueDefReachesEndOfBlock(def, v, bb)
         )
       or
       type = "Phi node has less than two inputs" and
-      result = count(PhiNode phi, int inputs | uselessPhiNode(phi, inputs))
+      result = strictcount(PhiNode phi, int inputs | uselessPhiNode(phi, inputs))
       or
       type = "Read does not have a prior reference" and
-      result = count(SourceVariable v, BasicBlock bb, int i | readWithoutPriorRef(v, bb, i))
+      result = strictcount(SourceVariable v, BasicBlock bb, int i | readWithoutPriorRef(v, bb, i))
       or
       type = "Read has multiple prior references" and
       result =
-        count(SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
+        strictcount(SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
           readWithMultiplePriorRefs(v, bb1, i1, bb2, i2)
         )
       or
       type = "Phi has less than 2 immediately prior references" and
       result =
-        count(PhiNode phi, BasicBlock bbPhi, SourceVariable v, int inputRefs |
+        strictcount(PhiNode phi, BasicBlock bbPhi, SourceVariable v, int inputRefs |
           phiWithoutTwoPriorRefs(phi, bbPhi, v, inputRefs)
         )
       or
       type = "Phi read has less than 2 immediately prior references" and
       result =
-        count(BasicBlock bbPhi, SourceVariable v, int inputRefs |
+        strictcount(BasicBlock bbPhi, SourceVariable v, int inputRefs |
           phiReadWithoutTwoPriorRefs(bbPhi, v, inputRefs)
         )
       or
       type = "Post-update without read" and
-      result = count(SourceVariable v, BasicBlock bb, int i | postUpdateWithoutRead(v, bb, i))
+      result = strictcount(SourceVariable v, BasicBlock bb, int i | postUpdateWithoutRead(v, bb, i))
     }
   }