From 9636d8e04f1a7fdfb450baf8bffecafd95223ef1 Mon Sep 17 00:00:00 2001
From: Vincent Rabaud <vrabaud@google.com>
Date: Thu, 9 Oct 2025 10:19:04 +0200
Subject: [PATCH] Restrict MSAN fixes to old clang versions

Bug: 448420960
Change-Id: Ia9cb762bc9f5d9415a28ddebaf39855c46a51768
---
 src/dsp/cpu.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dsp/cpu.h b/src/dsp/cpu.h
index e35f0301..6462d870 100644
--- a/src/dsp/cpu.h
+++ b/src/dsp/cpu.h
@@ -184,7 +184,8 @@
 #endif
 
 #if defined(__has_feature)
-#if __has_feature(memory_sanitizer)
+// Clang 21 should have all the MSAN fixes needed for WebP.
+#if __has_feature(memory_sanitizer) && !LOCAL_CLANG_PREREQ(21, 0)
 #define WEBP_MSAN
 #endif
 #endif