Commit `4930094e62`

Frank Denis <github@pureftpd.org>

2023-10-03 03:37:17

valgrind.memcheck: fix makeMem*()

The `makeMem*()` functions crashed under valgrind in Debug and ReleaseSafe modes. The reason being that `doMemCheckClientRequestExpr()` returns `0` when not running under Valgrind, and `maxInt(usize)` when running under Valgrind. Thus, `@as(i1, @intCast(maxInt(usize)))` always fails and these functions crashed before returning. That being said, what these functions used to return was quite unexpected: `0` on error and `-1` on success (=running under valgrind). That doesn't match any Zig nor C conventions. But that return value doesn't seem to be very useful. Either we are running under Valgrind or we are not. There's no point in checking this for every single call. Applications are likely to always discard it. So, just return a `void` instead. Also avoid function comments that start with `Similarly, ...` because that doesn't refer to anything in the context of autodoc or in IDEs.

master

1 parent 0bdbd3e

Changed files (1)

lib

std

valgrind

memcheck.zig

@@ -29,35 +29,29 @@ fn doMemCheckClientRequestStmt(request: MemCheckClientRequest, a1: usize, a2: us
 }
 
 /// Mark memory at qzz.ptr as unaddressable for qzz.len bytes.
-/// This returns -1 when run on Valgrind and 0 otherwise.
-pub fn makeMemNoAccess(qzz: []u8) i1 {
-    return @as(i1, @intCast(doMemCheckClientRequestExpr(0, // default return
-        .MakeMemNoAccess, @intFromPtr(qzz.ptr), qzz.len, 0, 0, 0)));
+pub fn makeMemNoAccess(qzz: []u8) void {
+    _ = doMemCheckClientRequestExpr(0, // default return
+        .MakeMemNoAccess, @intFromPtr(qzz.ptr), qzz.len, 0, 0, 0);
 }
 
-/// Similarly, mark memory at qzz.ptr as addressable but undefined
-/// for qzz.len bytes.
-/// This returns -1 when run on Valgrind and 0 otherwise.
-pub fn makeMemUndefined(qzz: []u8) i1 {
-    return @as(i1, @intCast(doMemCheckClientRequestExpr(0, // default return
-        .MakeMemUndefined, @intFromPtr(qzz.ptr), qzz.len, 0, 0, 0)));
+/// Mark memory at qzz.ptr as addressable but undefined for qzz.len bytes.
+pub fn makeMemUndefined(qzz: []u8) void {
+    _ = doMemCheckClientRequestExpr(0, // default return
+        .MakeMemUndefined, @intFromPtr(qzz.ptr), qzz.len, 0, 0, 0);
 }
 
-/// Similarly, mark memory at qzz.ptr as addressable and defined
-/// for qzz.len bytes.
-pub fn makeMemDefined(qzz: []u8) i1 {
-    // This returns -1 when run on Valgrind and 0 otherwise.
-    return @as(i1, @intCast(doMemCheckClientRequestExpr(0, // default return
-        .MakeMemDefined, @intFromPtr(qzz.ptr), qzz.len, 0, 0, 0)));
+/// Mark memory at qzz.ptr as addressable and defined or qzz.len bytes.
+pub fn makeMemDefined(qzz: []u8) void {
+    _ = doMemCheckClientRequestExpr(0, // default return
+        .MakeMemDefined, @intFromPtr(qzz.ptr), qzz.len, 0, 0, 0);
 }
 
 /// Similar to makeMemDefined except that addressability is
 /// not altered: bytes which are addressable are marked as defined,
 /// but those which are not addressable are left unchanged.
-/// This returns -1 when run on Valgrind and 0 otherwise.
-pub fn makeMemDefinedIfAddressable(qzz: []u8) i1 {
-    return @as(i1, @intCast(doMemCheckClientRequestExpr(0, // default return
-        .MakeMemDefinedIfAddressable, @intFromPtr(qzz.ptr), qzz.len, 0, 0, 0)));
+pub fn makeMemDefinedIfAddressable(qzz: []u8) void {
+    _ = doMemCheckClientRequestExpr(0, // default return
+        .MakeMemDefinedIfAddressable, @intFromPtr(qzz.ptr), qzz.len, 0, 0, 0);
 }
 
 /// Create a block-description handle.  The description is an ascii

Commit 4930094e62

Commit `4930094e62`