From 89717eae4652d49ee914f886a7c05cdffa025e81 Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Wed, 7 Jan 2026 14:01:31 -0800 Subject: [PATCH] [vm/ubsan] Fix NO_SANITIZE_UNDEFINED definition. This is a follow-up to 61c3fbc220778f7c5160f4bf3710731f2fae8a42 to make it accomodate android builds. Fixes https://ci.chromium.org/ui/p/dart/builders/ci.sandbox/vm-ffi-android-product-arm64c/10387 breakage. TEST=ci Change-Id: I0d18446014516b7de94ca1ed7336c0b98d699ee6 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/471324 Commit-Queue: Alexander Aprelev Reviewed-by: Ryan Macnak --- runtime/platform/undefined_behavior_sanitizer.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/runtime/platform/undefined_behavior_sanitizer.h b/runtime/platform/undefined_behavior_sanitizer.h index c515696dcb4..1985d0542f8 100644 --- a/runtime/platform/undefined_behavior_sanitizer.h +++ b/runtime/platform/undefined_behavior_sanitizer.h @@ -5,6 +5,10 @@ #ifndef RUNTIME_PLATFORM_UNDEFINED_BEHAVIOR_SANITIZER_H_ #define RUNTIME_PLATFORM_UNDEFINED_BEHAVIOR_SANITIZER_H_ +#ifdef __clang__ +#define NO_SANITIZE_UNDEFINED(check) [[clang::no_sanitize(check)]] +#else #define NO_SANITIZE_UNDEFINED(check) [[gnu::no_sanitize(check)]] +#endif #endif // RUNTIME_PLATFORM_UNDEFINED_BEHAVIOR_SANITIZER_H_