Skip to content

Commit 1ff6c4c

Browse files
geoffw0geoffw0
committed
C++: Restore change and see effect on test.
1 parent 5bd58f0 commit 1ff6c4c

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

‎cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ private Overlap getExtentOverlap(MemoryLocation0 def, MemoryLocation0 use) {
688688
(
689689
// EntireAllocationMemoryLocation exactly overlaps itself.
690690
use instanceof EntireAllocationMemoryLocation and
691-
// def.getAnAllocation() = use.getAnAllocation() and
691+
def.getAnAllocation() = use.getAnAllocation() and
692692
result instanceof MustExactlyOverlap
693693
or
694694
not use instanceof EntireAllocationMemoryLocation and

‎cpp/ql/test/library-tests/ir/ssa/aliased_ssa_overlap.expected

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,18 +187,10 @@
187187
| ssa.cpp:179:18:179:18 | ?*p | ssa.cpp:179:18:179:18 | ?*p | MayPartiallyOverlap |
188188
| ssa.cpp:184:46:184:46 | *a | ssa.cpp:184:46:184:46 | *a | MustExactlyOverlap |
189189
| ssa.cpp:184:46:184:46 | *a | ssa.cpp:184:46:184:46 | ?*a | MustTotallyOverlap |
190-
| ssa.cpp:184:46:184:46 | *a | ssa.cpp:184:63:184:63 | *b | MustExactlyOverlap |
191-
| ssa.cpp:184:46:184:46 | *a | ssa.cpp:184:63:184:63 | ?*b | MustTotallyOverlap |
192190
| ssa.cpp:184:46:184:46 | ?*a | ssa.cpp:184:46:184:46 | *a | MayPartiallyOverlap |
193191
| ssa.cpp:184:46:184:46 | ?*a | ssa.cpp:184:46:184:46 | ?*a | MayPartiallyOverlap |
194-
| ssa.cpp:184:46:184:46 | ?*a | ssa.cpp:184:63:184:63 | *b | MayPartiallyOverlap |
195-
| ssa.cpp:184:46:184:46 | ?*a | ssa.cpp:184:63:184:63 | ?*b | MayPartiallyOverlap |
196-
| ssa.cpp:184:63:184:63 | *b | ssa.cpp:184:46:184:46 | *a | MustExactlyOverlap |
197-
| ssa.cpp:184:63:184:63 | *b | ssa.cpp:184:46:184:46 | ?*a | MustTotallyOverlap |
198192
| ssa.cpp:184:63:184:63 | *b | ssa.cpp:184:63:184:63 | *b | MustExactlyOverlap |
199193
| ssa.cpp:184:63:184:63 | *b | ssa.cpp:184:63:184:63 | ?*b | MustTotallyOverlap |
200-
| ssa.cpp:184:63:184:63 | ?*b | ssa.cpp:184:46:184:46 | *a | MayPartiallyOverlap |
201-
| ssa.cpp:184:63:184:63 | ?*b | ssa.cpp:184:46:184:46 | ?*a | MayPartiallyOverlap |
202194
| ssa.cpp:184:63:184:63 | ?*b | ssa.cpp:184:63:184:63 | *b | MayPartiallyOverlap |
203195
| ssa.cpp:184:63:184:63 | ?*b | ssa.cpp:184:63:184:63 | ?*b | MayPartiallyOverlap |
204196
| ssa.cpp:184:80:184:80 | *c | ssa.cpp:184:80:184:80 | *c | MustExactlyOverlap |
@@ -496,8 +488,6 @@
496488
| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MustTotallyOverlap |
497489
| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | ?*a | MustTotallyOverlap |
498490
| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | MustTotallyOverlap |
499-
| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:43:446:43 | *b | MustExactlyOverlap |
500-
| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:43:446:43 | ?*b | MustTotallyOverlap |
501491
| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
502492
| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
503493
| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
@@ -508,16 +498,12 @@
508498
| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
509499
| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
510500
| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | MayPartiallyOverlap |
511-
| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
512-
| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
513501
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
514502
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
515503
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
516504
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | MayPartiallyOverlap |
517505
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
518506
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
519-
| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:34:446:34 | *a | MustExactlyOverlap |
520-
| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:34:446:34 | ?*a | MustTotallyOverlap |
521507
| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | *b | MustExactlyOverlap |
522508
| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MustTotallyOverlap |
523509
| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | ?*b | MustTotallyOverlap |
@@ -528,8 +514,6 @@
528514
| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MayPartiallyOverlap |
529515
| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
530516
| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b[0..?)<unknown> | MayPartiallyOverlap |
531-
| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
532-
| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
533517
| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
534518
| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MayPartiallyOverlap |
535519
| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |

0 commit comments

Comments
 (0)