Reduce partial definition flow edge redundancy

pavgust · jbj · commit 1b9a2d3d8776 · 2019-08-08T14:05:02.000+02:00
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowPrivate.qll
@@ -173,7 +173,7 @@ private class ArrayContent extends Content, TArrayContent {
 predicate storeStep(Node node1, Content f, PostUpdateNode node2) {
   exists(FieldAccess fa |
     exists(Assignment a |
-      (a.getRValue() = node1.asExpr() or node1.asExpr() = a) and
+      node1.asExpr() = a and
       a.getLValue() = fa
     ) and
     not fa.getTarget().isStatic() and
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/FlowVar.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/FlowVar.qll
@@ -320,7 +320,8 @@ module FlowVar_internal {
     BlockVar() { this = TBlockVar(sbb, v) }
 
     override VariableAccess getAnAccess() {
-      variableAccessInSBB(v, getAReachedBlockVarSBB(this), result)
+      variableAccessInSBB(v, getAReachedBlockVarSBB(this), result) and
+      result != sbb
     }
 
     override predicate definedByInitialValue(LocalScopeVariable lsv) {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,8 @@ module FlowVar_internal {`
`320`	`320`	`BlockVar() { this = TBlockVar(sbb, v) }`
`321`	`321`
`322`	`322`	`override VariableAccess getAnAccess() {`
`323`		`- variableAccessInSBB(v, getAReachedBlockVarSBB(this), result)`
	`323`	`+ variableAccessInSBB(v, getAReachedBlockVarSBB(this), result) and`
	`324`	`+ result != sbb`
`324`	`325`	`}`
`325`	`326`
`326`	`327`	`override predicate definedByInitialValue(LocalScopeVariable lsv) {`