[FFmpeg-devel] [PATCH] avutil/avassert: use __builtin_assume if available (PR #20151)

[Kacper Michajłow]

PR #20151 opened by Kacper Michajłow (kasper93)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20151
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20151.patch


From 888d807e9cb95419cac7d272bee7cc3ca00c2157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93 at gmail.com>
Date: Thu, 7 Aug 2025 04:00:48 +0200
Subject: [PATCH] avutil/avassert: use __builtin_assume if available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
---
 libavutil/avassert.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavutil/avassert.h b/libavutil/avassert.h
index 8dbdb01566..f4f039dfb0 100644
--- a/libavutil/avassert.h
+++ b/libavutil/avassert.h
@@ -101,7 +101,6 @@ do {                                                                    \
 #define av_unreachable(msg) __builtin_unreachable()
 #elif  defined(_MSC_VER)
 #define av_unreachable(msg) __assume(0)
-#define av_assume(cond)     __assume(cond)
 #elif __STDC_VERSION__ >= 202311L
 #include <stddef.h>
 #define av_unreachable(msg) unreachable()
@@ -109,7 +108,11 @@ do {                                                                    \
 #define av_unreachable(msg) ((void)0)
 #endif
 
-#ifndef av_assume
+#if AV_HAS_BUILTIN(__builtin_assume)
+#define av_assume(cond) __builtin_assume(cond)
+#elif defined(_MSC_VER)
+#define av_assume(cond) __assume(cond)
+#else
 #define av_assume(cond) do { \
     if (!(cond))             \
         av_unreachable();    \
-- 
2.49.1