Merge pull request #6293 from hvitved/csharp/ssa/remove-redundant-conjunct

C#: Remove redundant conjunct in `ssaDefReachesReadWithinBlock`

Author: hvitved

csharp/ql/src/semmle/code/cil/internal/SsaImplCommon.qll

@@ -284,8 +284,7 @@ private module SsaDefReaches {
   predicate ssaDefReachesReadWithinBlock(SourceVariable v, Definition def, BasicBlock bb, int i) {
     exists(int rnk |
       ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaRead()) and
-      variableRead(bb, i, v, _)
+      rnk = ssaRefRank(bb, i, v, SsaRead())
     )
   }
 

csharp/ql/src/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll

@@ -284,8 +284,7 @@ private module SsaDefReaches {
   predicate ssaDefReachesReadWithinBlock(SourceVariable v, Definition def, BasicBlock bb, int i) {
     exists(int rnk |
       ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaRead()) and
-      variableRead(bb, i, v, _)
+      rnk = ssaRefRank(bb, i, v, SsaRead())
     )
   }
 

csharp/ql/src/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll

@@ -284,8 +284,7 @@ private module SsaDefReaches {
   predicate ssaDefReachesReadWithinBlock(SourceVariable v, Definition def, BasicBlock bb, int i) {
     exists(int rnk |
       ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaRead()) and
-      variableRead(bb, i, v, _)
+      rnk = ssaRefRank(bb, i, v, SsaRead())
     )
   }
 

csharp/ql/src/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll

@@ -284,8 +284,7 @@ private module SsaDefReaches {
   predicate ssaDefReachesReadWithinBlock(SourceVariable v, Definition def, BasicBlock bb, int i) {
     exists(int rnk |
       ssaDefReachesRank(bb, def, rnk, v) and
-      rnk = ssaRefRank(bb, i, v, SsaRead()) and
-      variableRead(bb, i, v, _)
+      rnk = ssaRefRank(bb, i, v, SsaRead())
     )
   }