C++: Fix join order in 'boundFlowCond'.

MathiasVP · MathiasVP · commit 0f240d67389c · 2023-03-22T17:00:07.000Z
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/semantic/analysis/RangeAnalysisStage.qll b/cpp/ql/lib/experimental/semmle/code/cpp/semantic/analysis/RangeAnalysisStage.qll
@@ -495,7 +495,7 @@ module RangeStage<DeltaSig D, BoundSig<D> Bounds, LangSig<D> LangParam, UtilSig<
       SemSsaVariable v2, SemGuard guardEq, boolean eqIsTrue, D::Delta d1, D::Delta d2,
       D::Delta oldDelta
     |
-      guardEq = semEqFlowCond(v, semSsaRead(v2, d1), d2, true, eqIsTrue) and
+      guardEq = semEqFlowCond(v, semSsaRead(pragma[only_bind_into](v2), d1), d2, true, eqIsTrue) and
       result = boundFlowCond(v2, e, oldDelta, upper, testIsTrue) and
       // guardEq needs to control guard
       guardEq.directlyControls(result.getBasicBlock(), eqIsTrue) and

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ module RangeStage<DeltaSig D, BoundSig<D> Bounds, LangSig<D> LangParam, UtilSig<`
`495`	`495`	`SemSsaVariable v2, SemGuard guardEq, boolean eqIsTrue, D::Delta d1, D::Delta d2,`
`496`	`496`	`D::Delta oldDelta`
`497`	`497`	`\|`
`498`		`- guardEq = semEqFlowCond(v, semSsaRead(v2, d1), d2, true, eqIsTrue) and`
	`498`	`+ guardEq = semEqFlowCond(v, semSsaRead(pragma[only_bind_into](v2), d1), d2, true, eqIsTrue) and`
`499`	`499`	`result = boundFlowCond(v2, e, oldDelta, upper, testIsTrue) and`
`500`	`500`	`// guardEq needs to control guard`
`501`	`501`	`guardEq.directlyControls(result.getBasicBlock(), eqIsTrue) and`