C++: Add an explicit test of AllocationFunction and AllocationExpr.

Author: geoffw0

cpp/ql/test/library-tests/allocators/allocators.expected

@@ -46,3 +46,28 @@ deleteArrayExprs
 | allocators.cpp:81:3:81:45 | delete[] | Overaligned | operator delete[](void *, unsigned long, align_val_t) -> void | 256 | 128 | sized aligned |
 | allocators.cpp:82:3:82:49 | delete[] | PolymorphicBase | operator delete[](void *, unsigned long) -> void | 8 | 8 | sized  |
 | allocators.cpp:83:3:83:23 | delete[] | int | operator delete[](void *, unsigned long) -> void | 4 | 4 | sized  |
+allocationFunctions
+allocationExprs
+| allocators.cpp:49:3:49:9 | new | getSizeBytes = 4, requiresDealloc |
+| allocators.cpp:50:3:50:15 | new | getSizeBytes = 4, requiresDealloc |
+| allocators.cpp:51:3:51:11 | new | getSizeBytes = 4, requiresDealloc |
+| allocators.cpp:52:3:52:14 | new | getSizeBytes = 8, requiresDealloc |
+| allocators.cpp:53:3:53:27 | new | getSizeBytes = 8, requiresDealloc |
+| allocators.cpp:54:3:54:17 | new | getSizeBytes = 256, requiresDealloc |
+| allocators.cpp:55:3:55:25 | new | getSizeBytes = 256, requiresDealloc |
+| allocators.cpp:68:3:68:12 | new[] | getSizeExpr = n, getSizeMult = 4, requiresDealloc |
+| allocators.cpp:69:3:69:18 | new[] | getSizeExpr = n, getSizeMult = 4, requiresDealloc |
+| allocators.cpp:70:3:70:15 | new[] | getSizeExpr = n, getSizeMult = 8, requiresDealloc |
+| allocators.cpp:71:3:71:20 | new[] | getSizeExpr = n, getSizeMult = 256, requiresDealloc |
+| allocators.cpp:72:3:72:16 | new[] | getSizeBytes = 80, requiresDealloc |
+| allocators.cpp:107:3:107:18 | new | getSizeBytes = 1, requiresDealloc |
+| allocators.cpp:108:3:108:19 | new[] | getSizeExpr = n, getSizeMult = 1, requiresDealloc |
+| allocators.cpp:109:3:109:35 | new | getSizeBytes = 128, requiresDealloc |
+| allocators.cpp:110:3:110:37 | new[] | getSizeBytes = 1280, requiresDealloc |
+| allocators.cpp:129:3:129:21 | new | getSizeBytes = 4 |
+| allocators.cpp:132:3:132:17 | new[] | getSizeBytes = 4 |
+| allocators.cpp:135:3:135:26 | new | getSizeBytes = 4, requiresDealloc |
+| allocators.cpp:136:3:136:26 | new[] | getSizeBytes = 8, requiresDealloc |
+| allocators.cpp:142:13:142:27 | new[] | getSizeExpr = x, getSizeMult = 10, requiresDealloc |
+| allocators.cpp:143:13:143:28 | new[] | getSizeBytes = 400, requiresDealloc |
+| allocators.cpp:144:13:144:31 | new[] | getSizeExpr = x, getSizeMult = 900, requiresDealloc |

cpp/ql/test/library-tests/allocators/allocators.ql

@@ -103,3 +103,39 @@ query predicate deleteArrayExprs(
     )
   )
 }
+
+string describeAllocationFunction(AllocationFunction f) {
+	result = "getSizeArg = " + f.getSizeArg().toString()
+	or
+	result = "getSizeMult = " + f.getSizeMult().toString()
+	or
+	result = "getReallocPtrArg = " + f.getReallocPtrArg().toString()
+	or
+	(
+		f.requiresDealloc() and
+		result = "requiresDealloc"
+	)
+}
+
+query predicate allocationFunctions(AllocationFunction f, string descr) {
+	descr = concat(describeAllocationFunction(f), ", ")
+}
+
+string describeAllocationExpr(AllocationExpr e) {
+	result = "getSizeExpr = " + e.getSizeExpr().toString()
+	or
+	result = "getSizeMult = " + e.getSizeMult().toString()
+	or
+	result = "getSizeBytes = " + e.getSizeBytes().toString()
+	or
+	result = "getReallocPtr = " + e.getReallocPtr().toString()
+	or
+	(
+		e.requiresDealloc() and
+		result = "requiresDealloc"
+	)
+}
+
+query predicate allocationExprs(AllocationExpr e, string descr) {
+	descr = concat(describeAllocationExpr(e), ", ")
+}