git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] use __builtin_add_overflow() in st_add() with Clang

From
René Scharfe <l.s.r@web.de>
Date
May 15, 2026, 14:36 UTC
Message-ID
<26b71f9c-0cc5-4bfd-9175-f45b584e202e@web.de>
In-Reply-To
<20260515044059.GB83595@coredump.intra.peff.net>
On 5/15/26 6:40 AM, Jeff King wrote:
Show 12 quoted lines
> On Thu, May 14, 2026 at 05:13:46PM +0200, René Scharfe wrote:
> 
>> Clang and GCC optimize away comparisons of overflow checks by checking
>> the carry flag on x64.  GCC does the same on ARM64, but Clang currently
>> (version 22.1) doesn't.
>>
>> Provide a variant of st_add() that wraps __builtin_add_overflow() to
>> help Clang optimize it.  Use it on all platforms for simplicity.
> 
> OK. I probably would have just used the intrinsic everywhere with
> __GNUC__, but if gcc is already figuring it out, it doesn't matter in
> practice.

Did that initially, but found it hard to justify when it has no benefit and reduces the test coverage of the hand-made check significantly.

Show 20 quoted lines
>> +/* Help Clang; GCC generates the same code for both variants. */
>> +#if defined(__clang__)
>> +static inline size_t st_add(size_t a, size_t b)
>> +{
>> +	size_t sum;
>> +	if (__builtin_add_overflow(a, b, &sum))
>> +		die("size_t overflow: %"PRIuMAX" + %"PRIuMAX,
>> +		    (uintmax_t)a, (uintmax_t)b);
>> +	return sum;
>> +}
>> +#else
>>  static inline size_t st_add(size_t a, size_t b)
>>  {
>>  	if (unsigned_add_overflows(a, b))
> 
> It's a shame we can't share more code here, especially the die message.
> 
> I guess the ideal primitive is probably a wrapper with the same
> interface as __builtin_add_overflow(), which could then be used
> everywhere that unsigned_add_overflows() with some minor conversion.
Junio said the same. :)
> But it gets awkward to do as a macro, and using an inline function runs
> into type questions.

Indeed. If it was easy then this wouldn't exist as a builtin. We can approximate it somewhat, but will it be robust enough?

René
Previous: Jeff KingNext: Jeff King
Message 7 of 18 in “strbuf: use st_add3() in strbuf_grow()”
  1. 1/2 strbuf: use st_add3() in strbuf_grow()René Scharfe, May 14, 2026
  2. 2/2 use __builtin_add_overflow() in st_add() with ClangRené Scharfe, May 14, 2026
  3. Junio C HamanoMay 14, 2026
  4. René ScharfeMay 14, 2026
  5. René ScharfeMay 15, 2026
  6. Jeff KingMay 15, 2026
  7. René ScharfeMay 15, 2026
  8. Jeff KingMay 15, 2026
  9. Junio C HamanoMay 14, 2026
  10. René ScharfeMay 14, 2026
  11. Jeff KingMay 15, 2026
  12. René ScharfeMay 15, 2026
  13. Jeff KingMay 15, 2026
  14. 0/2 use __builtin_add_overflow() in st_add() with ClangRené Scharfe, May 18, 2026
  15. 2/2 use __builtin_add_overflow() in st_add() with ClangRené Scharfe, May 18, 2026
  16. 1/2 strbuf: use st_add3() in strbuf_grow()René Scharfe, May 18, 2026
  17. Jeff KingMay 19, 2026
  18. Junio C HamanoMay 19, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.