Merge pull request #6050 from MathiasVP/fix-join-order-in-addressOperandAllocationAndOffset

Dave Bartolomeo · web-flow · commit 4f81484e91ae · 2021-06-09T12:20:50.000-04:00
C++: Fix join order in `addressOperandAllocationAndOffset`
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysis.qll
@@ -411,7 +411,7 @@ predicate addressOperandAllocationAndOffset(
     allocation.getABaseInstruction() = base and
     hasBaseAndOffset(addrOperand, base, bitOffset) and
     not exists(Instruction previousBase |
-      hasBaseAndOffset(addrOperand, previousBase, _) and
+      hasBaseAndOffset(addrOperand, pragma[only_bind_out](previousBase), _) and
       previousBase = base.getAnOperand().getDef()
     )
   )
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll
@@ -411,7 +411,7 @@ predicate addressOperandAllocationAndOffset(
     allocation.getABaseInstruction() = base and
     hasBaseAndOffset(addrOperand, base, bitOffset) and
     not exists(Instruction previousBase |
-      hasBaseAndOffset(addrOperand, previousBase, _) and
+      hasBaseAndOffset(addrOperand, pragma[only_bind_out](previousBase), _) and
       previousBase = base.getAnOperand().getDef()
     )
   )
diff --git a/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll b/csharp/ql/src/experimental/ir/implementation/unaliased_ssa/internal/AliasAnalysis.qll
@@ -411,7 +411,7 @@ predicate addressOperandAllocationAndOffset(
     allocation.getABaseInstruction() = base and
     hasBaseAndOffset(addrOperand, base, bitOffset) and
     not exists(Instruction previousBase |
-      hasBaseAndOffset(addrOperand, previousBase, _) and
+      hasBaseAndOffset(addrOperand, pragma[only_bind_out](previousBase), _) and
       previousBase = base.getAnOperand().getDef()
     )
   )

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ predicate addressOperandAllocationAndOffset(`
`411`	`411`	`allocation.getABaseInstruction() = base and`
`412`	`412`	`hasBaseAndOffset(addrOperand, base, bitOffset) and`
`413`	`413`	`not exists(Instruction previousBase \|`
`414`		`- hasBaseAndOffset(addrOperand, previousBase, _) and`
	`414`	`+ hasBaseAndOffset(addrOperand, pragma[only_bind_out](previousBase), _) and`
`415`	`415`	`previousBase = base.getAnOperand().getDef()`
`416`	`416`	`)`
`417`	`417`	`)`