Skip to content

Commit 8f446aa

Browse files
author
Robert Marsh
committed
C++: fix handling of aligned allocators
1 parent 5549b6f commit 8f446aa

File tree

3 files changed

+40
-25
lines changed

3 files changed

+40
-25
lines changed

‎cpp/ql/src/semmle/code/cpp/valuenumbering/HashCons.qll‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ private cached newtype HCBase =
9292
mk_MemberFunctionCall(trg, qual, args, _)
9393
}
9494
or
95-
HC_NewExpr(Type t, HC_Alloc alloc, HC_Init init) {
96-
mk_NewExpr(t, alloc, init, _, _)
95+
HC_NewExpr(Type t, HC_Alloc alloc, HC_Init init, HC_Align align) {
96+
mk_NewExpr(t, alloc, init, align, _, _)
9797
} or
98-
HC_NewArrayExpr(Type t, HC_Alloc alloc, HC_Init init) {
99-
mk_NewArrayExpr(t, alloc, init, _, _)
98+
HC_NewArrayExpr(Type t, HC_Alloc alloc, HC_Init init, HC_Align align) {
99+
mk_NewArrayExpr(t, alloc, init, align, _, _)
100100
}
101101
or
102102
HC_SizeofType(Type t) {mk_SizeofType(t, _)}
@@ -123,11 +123,18 @@ private newtype HC_Alloc =
123123
}
124124
or
125125
HC_NoAlloc()
126+
127+
/** Used to implement optional init on `new` expressions */
126128
private newtype HC_Init =
127129
HC_NoInit()
128130
or
129131
HC_HasInit(HashCons hc) {mk_HasInit(hc, _)}
130132

133+
private newtype HC_Align =
134+
HC_NoAlign()
135+
or
136+
HC_HasAlign(HashCons hc) {mk_HasAlign(hc, _)}
137+
131138
/** Used to implement hash-consing of argument lists */
132139
private newtype HC_Args =
133140
HC_EmptyArgs(Function fcn) {
@@ -525,6 +532,10 @@ private predicate mk_HasInit(HashCons hc, NewOrNewArrayExpr new) {
525532
hc = hashCons(new.(NewArrayExpr).getInitializer())
526533
}
527534

535+
private predicate mk_HasAlign(HashCons hc, NewOrNewArrayExpr new) {
536+
hc = hashCons(new.getAlignmentArgument())
537+
}
538+
528539
private predicate analyzableNewExpr(NewExpr new) {
529540
strictcount(new.getAllocatedType()) = 1 and
530541
(
@@ -538,14 +549,16 @@ private predicate analyzableNewExpr(NewExpr new) {
538549
)
539550
}
540551

541-
private predicate mk_NewExpr(Type t, HC_Alloc alloc, HC_Init init, boolean aligned, NewExpr new) {
552+
private predicate mk_NewExpr(Type t, HC_Alloc alloc, HC_Init init, HC_Align align, boolean aligned,
553+
NewExpr new) {
542554
analyzableNewExpr(new) and
543555
t = new.getAllocatedType() and
544556
(
545-
new.hasAlignedAllocation() and
557+
align = HC_HasAlign(hashCons(new.getAlignmentArgument())) and
546558
aligned = true
547559
or
548560
not new.hasAlignedAllocation() and
561+
align = HC_NoAlign() and
549562
aligned = false
550563
)
551564
and
@@ -594,15 +607,16 @@ private predicate analyzableNewArrayExpr(NewArrayExpr new) {
594607
)
595608
}
596609

597-
private predicate mk_NewArrayExpr(Type t, HC_Alloc alloc, HC_Init init, boolean aligned,
598-
NewArrayExpr new) {
610+
private predicate mk_NewArrayExpr(Type t, HC_Alloc alloc, HC_Init init, HC_Align align,
611+
boolean aligned, NewArrayExpr new) {
599612
analyzableNewArrayExpr(new) and
600613
t = new.getAllocatedType() and
601614
(
602-
new.hasAlignedAllocation() and
615+
align = HC_HasAlign(hashCons(new.getAlignmentArgument())) and
603616
aligned = true
604617
or
605618
not new.hasAlignedAllocation() and
619+
align = HC_NoAlign() and
606620
aligned = false
607621
)
608622
and
@@ -744,14 +758,14 @@ cached HashCons hashCons(Expr e) {
744758
result = HC_MemberFunctionCall(fcn, qual, args)
745759
)
746760
or
747-
exists(Type t, HC_Alloc alloc, HC_Init init, boolean aligned
748-
| mk_NewExpr(t, alloc, init, aligned, e) and
749-
result = HC_NewExpr(t, alloc, init)
761+
exists(Type t, HC_Alloc alloc, HC_Init init, HC_Align align, boolean aligned
762+
| mk_NewExpr(t, alloc, init, align, aligned, e) and
763+
result = HC_NewExpr(t, alloc, init, align)
750764
)
751765
or
752-
exists(Type t, HC_Alloc alloc, HC_Init init, boolean aligned
753-
| mk_NewArrayExpr(t, alloc, init, aligned, e) and
754-
result = HC_NewArrayExpr(t, alloc, init)
766+
exists(Type t, HC_Alloc alloc, HC_Init init, HC_Align align, boolean aligned
767+
| mk_NewArrayExpr(t, alloc, init, align, aligned, e) and
768+
result = HC_NewArrayExpr(t, alloc, init, align)
755769
)
756770
or
757771
exists(Type t

‎cpp/ql/test/library-tests/valuenumbering/HashCons/HashCons.expected‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
| test.cpp:92:11:92:11 | x | 92:c11-c11 93:c10-c10 |
3939
| test.cpp:97:3:97:3 | x | 97:c3-c3 98:c3-c3 |
4040
| test.cpp:97:3:97:5 | ... ++ | 97:c3-c5 98:c3-c5 |
41-
| test.cpp:103:10:103:11 | 1 | 103:c10-c11 104:c7-c7 107:c7-c7 108:c7-c7 10:c16-c16 179:c21-c21 247:c11-c11 248:c11-c11 270:c19-c19 271:c19-c19 |
41+
| test.cpp:103:10:103:11 | 1 | 103:c10-c11 104:c7-c7 107:c7-c7 108:c7-c7 10:c16-c16 179:c21-c21 247:c11-c11 248:c11-c11 271:c19-c19 272:c19-c19 |
4242
| test.cpp:104:3:104:3 | x | 104:c3-c3 105:c3-c3 106:c3-c3 107:c3-c3 108:c3-c3 |
43-
| test.cpp:105:7:105:7 | 2 | 105:c7-c7 106:c7-c7 107:c11-c11 108:c11-c11 21:c16-c16 249:c11-c11 270:c15-c15 270:c22-c22 271:c15-c15 271:c22-c22 272:c15-c15 |
43+
| test.cpp:105:7:105:7 | 2 | 105:c7-c7 106:c7-c7 107:c11-c11 108:c11-c11 21:c16-c16 249:c11-c11 271:c15-c15 271:c22-c22 272:c15-c15 272:c22-c22 273:c15-c15 |
4444
| test.cpp:107:7:107:11 | ... + ... | 107:c7-c11 108:c7-c11 |
4545
| test.cpp:110:15:110:17 | 1 | 110:c15-c17 111:c9-c11 |
4646
| test.cpp:110:15:110:17 | (char *)... | 110:c15-c17 111:c9-c11 |
@@ -86,14 +86,14 @@
8686
| test.cpp:247:3:247:12 | new | 247:c3-c12 248:c3-c12 |
8787
| test.cpp:253:16:253:36 | new[] | 253:c16-c36 254:c16-c36 |
8888
| test.cpp:256:3:256:21 | new | 256:c3-c21 257:c3-c21 |
89-
| test.cpp:256:7:256:10 | (void *)... | 256:c7-c10 257:c7-c10 260:c11-c14 261:c11-c14 |
90-
| test.cpp:256:7:256:10 | ptr1 | 256:c7-c10 257:c7-c10 260:c11-c14 261:c11-c14 |
89+
| test.cpp:256:7:256:10 | (void *)... | 256:c7-c10 257:c7-c10 260:c11-c14 261:c11-c14 263:c11-c14 |
90+
| test.cpp:256:7:256:10 | ptr1 | 256:c7-c10 257:c7-c10 260:c11-c14 261:c11-c14 263:c11-c14 |
9191
| test.cpp:258:7:258:10 | (void *)... | 258:c7-c10 262:c11-c14 |
9292
| test.cpp:258:7:258:10 | ptr2 | 258:c7-c10 262:c11-c14 |
9393
| test.cpp:260:3:260:25 | new | 260:c3-c25 261:c3-c25 |
94-
| test.cpp:260:7:260:8 | 32 | 260:c7-c8 261:c7-c8 262:c7-c8 264:c7-c8 265:c7-c8 267:c7-c8 268:c7-c8 270:c7-c8 271:c7-c8 272:c7-c8 |
95-
| test.cpp:260:7:260:8 | (size_t)... | 260:c7-c8 261:c7-c8 262:c7-c8 264:c7-c8 265:c7-c8 267:c7-c8 268:c7-c8 270:c7-c8 271:c7-c8 272:c7-c8 |
96-
| test.cpp:264:3:264:19 | new | 264:c3-c19 265:c3-c19 |
97-
| test.cpp:267:3:267:23 | new[] | 267:c3-c23 268:c3-c23 |
98-
| test.cpp:267:21:267:22 | 10 | 267:c21-c22 268:c21-c22 92:c15-c16 |
99-
| test.cpp:272:19:272:19 | 3 | 272:c19-c19 35:c16-c16 |
94+
| test.cpp:260:7:260:8 | 32 | 260:c7-c8 261:c7-c8 262:c7-c8 265:c7-c8 266:c7-c8 268:c7-c8 269:c7-c8 271:c7-c8 272:c7-c8 273:c7-c8 |
95+
| test.cpp:260:7:260:8 | (size_t)... | 260:c7-c8 261:c7-c8 262:c7-c8 265:c7-c8 266:c7-c8 268:c7-c8 269:c7-c8 271:c7-c8 272:c7-c8 273:c7-c8 |
96+
| test.cpp:265:3:265:19 | new | 265:c3-c19 266:c3-c19 |
97+
| test.cpp:268:3:268:23 | new[] | 268:c3-c23 269:c3-c23 |
98+
| test.cpp:268:21:268:22 | 10 | 268:c21-c22 269:c21-c22 92:c15-c16 |
99+
| test.cpp:273:19:273:19 | 3 | 273:c19-c19 35:c16-c16 |

‎cpp/ql/test/library-tests/valuenumbering/HashCons/test.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ void test16() {
260260
new(32, ptr1) IntHolder;
261261
new(32, ptr1) IntHolder;
262262
new(32, ptr2) IntHolder;
263+
new(16, ptr1) IntHolder;
263264

264265
new(32) IntHolder;
265266
new(32) IntHolder;

0 commit comments

Comments
 (0)