From 2c3bf8d6f064c5ccab1d57f3eb82381ff445cc4a Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 3 Oct 2023 16:26:05 -0400 Subject: dstring: Limit the special dchar typedef to lint builds Clang still thinks that alignof(dstr[1]) == 2, so out of an abundance of caution, don't mess with dchar alignment in normal builds. --- src/dstring.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/dstring.h') diff --git a/src/dstring.h b/src/dstring.h index 91a600c..6496a4f 100644 --- a/src/dstring.h +++ b/src/dstring.h @@ -14,19 +14,14 @@ #include /** Marker type for dynamic strings. */ -#if __clang__ +#if BFS_LINT && __clang__ // Abuse __attribute__(aligned) to make a type that allows // // dchar * -> char * // -// conversions, but warns on +// conversions, but warns (with Clang's -Walign-mismatch) on // // char * -> dchar * -// -// (with Clang's -Walign-mismatch). The alignment is not a lie, due to the -// layout of struct dstring, but we only enable this on Clang because GCC -// tracks alignment through array accesses, reporting UBSan errors on (and -// maybe even miscompiling) dstr[1]. typedef __attribute__((aligned(alignof(size_t)))) char dchar; #else typedef char dchar; -- cgit v1.2.3