Skip to content

Commit f9fa52f

Browse files
geoffw0geoffw0
committed
C++: Disabled the change again.
1 parent 1ff6c4c commit f9fa52f

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,18 @@
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 |
190192
| ssa.cpp:184:46:184:46 | ?*a | ssa.cpp:184:46:184:46 | *a | MayPartiallyOverlap |
191193
| 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 |
192198
| ssa.cpp:184:63:184:63 | *b | ssa.cpp:184:63:184:63 | *b | MustExactlyOverlap |
193199
| 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 |
194202
| ssa.cpp:184:63:184:63 | ?*b | ssa.cpp:184:63:184:63 | *b | MayPartiallyOverlap |
195203
| ssa.cpp:184:63:184:63 | ?*b | ssa.cpp:184:63:184:63 | ?*b | MayPartiallyOverlap |
196204
| ssa.cpp:184:80:184:80 | *c | ssa.cpp:184:80:184:80 | *c | MustExactlyOverlap |
@@ -488,6 +496,8 @@
488496
| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MustTotallyOverlap |
489497
| ssa.cpp:446:34:446:34 | *a | ssa.cpp:446:34:446:34 | ?*a | MustTotallyOverlap |
490498
| 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 |
491501
| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
492502
| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
493503
| ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
@@ -498,12 +508,16 @@
498508
| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
499509
| ssa.cpp:446:34:446:34 | ?*a | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
500510
| 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 |
501513
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a | MayPartiallyOverlap |
502514
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | *a[0..?)<unknown> | MayPartiallyOverlap |
503515
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a | MayPartiallyOverlap |
504516
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | MayPartiallyOverlap |
505517
| ssa.cpp:446:34:446:34 | ?*a[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
506518
| 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 |
507521
| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | *b | MustExactlyOverlap |
508522
| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MustTotallyOverlap |
509523
| ssa.cpp:446:43:446:43 | *b | ssa.cpp:446:43:446:43 | ?*b | MustTotallyOverlap |
@@ -514,6 +528,8 @@
514528
| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MayPartiallyOverlap |
515529
| ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |
516530
| 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 |
517533
| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | *b | MayPartiallyOverlap |
518534
| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | *b[0..?)<unknown> | MayPartiallyOverlap |
519535
| ssa.cpp:446:43:446:43 | ?*b | ssa.cpp:446:43:446:43 | ?*b | MayPartiallyOverlap |

0 commit comments

Comments
 (0)