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
Junio C Hamano <gitster@pobox.com>
Date
May 14, 2026, 19:12 UTC
Message-ID
<xmqqjyt5g5zr.fsf@gitster.g>
In-Reply-To
<0ded6062-f66a-4713-af24-d1b5aa654823@web.de>
René Scharfe <l.s.r@web.de> writes:
Show 22 quoted lines
> Provide a variant of st_add() that wraps __builtin_add_overflow() to
> help Clang optimize it.  Use it on all platforms for simplicity.
> ...
> +/* 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))
> @@ -621,6 +632,7 @@ static inline size_t st_add(size_t a, size_t b)
>  		    (uintmax_t)a, (uintmax_t)b);
>  	return a + b;
>  }
> +#endif

Makes me wonder if we tweaked unsigned_add_overflows() to take an extra *dst parameter to match __builtin_add_overflow(), which of course requires us to all of 18 callsites, it might make the whole thing a bit simpler. New uses of unsigned_add_overflows(), if we ever add them, would automatically benefit, right?

Previous: René ScharfeNext: René Scharfe
Message 3 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.