Skip to content

Commit b3e598c

Browse files
committed
C++/C#: fix another join order in SSA construction
1 parent 5318aa8 commit b3e598c

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ private module Cached {
192192
exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
193193
phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
194194
result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
195-
overlap = combineOverlap(phiOperandOverlap, originalOverlap)
195+
overlap =
196+
combineOverlap(pragma[only_bind_out](phiOperandOverlap),
197+
pragma[only_bind_out](originalOverlap))
196198
)
197199
)
198200
)

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ private module Cached {
192192
exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
193193
phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
194194
result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
195-
overlap = combineOverlap(phiOperandOverlap, originalOverlap)
195+
overlap =
196+
combineOverlap(pragma[only_bind_out](phiOperandOverlap),
197+
pragma[only_bind_out](originalOverlap))
196198
)
197199
)
198200
)

csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ private module Cached {
192192
exists(OldIR::PhiInputOperand phiOperand, Overlap phiOperandOverlap |
193193
phiOperand = getDegeneratePhiOperand(oldOperand.getAnyDef()) and
194194
result = getNewDefinitionFromOldSSA(phiOperand, phiOperandOverlap) and
195-
overlap = combineOverlap(phiOperandOverlap, originalOverlap)
195+
overlap =
196+
combineOverlap(pragma[only_bind_out](phiOperandOverlap),
197+
pragma[only_bind_out](originalOverlap))
196198
)
197199
)
198200
)

0 commit comments

Comments
 (0)