C++: Fix join-order problem in clearsContent

jketema · jketema · commit 2628552ef479 · 2023-06-27T11:59:26.000+02:00
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -786,7 +786,9 @@ predicate clearsContent(Node n, Content c) {
     )
     or
     forex(PostUpdateNode pun, Content d |
-      d.impliesClearOf(c) and storeStepImpl(_, d, pun, true) and pun.getPreUpdateNode() = n
+      pragma[only_bind_into](d).impliesClearOf(pragma[only_bind_into](c)) and
+      storeStepImpl(_, d, pun, true) and
+      pun.getPreUpdateNode() = n
     |
       c.getIndirectionIndex() = d.getIndirectionIndex()
     )

Original file line number	Diff line number	Diff line change
`@@ -786,7 +786,9 @@ predicate clearsContent(Node n, Content c) {`
`786`	`786`	`)`
`787`	`787`	`or`
`788`	`788`	`forex(PostUpdateNode pun, Content d \|`
`789`		`- d.impliesClearOf(c) and storeStepImpl(_, d, pun, true) and pun.getPreUpdateNode() = n`
	`789`	`+ pragma[only_bind_into](d).impliesClearOf(pragma[only_bind_into](c)) and`
	`790`	`+ storeStepImpl(_, d, pun, true) and`
	`791`	`+ pun.getPreUpdateNode() = n`
`790`	`792`	`\|`
`791`	`793`	`c.getIndirectionIndex() = d.getIndirectionIndex()`
`792`	`794`	`)`