Re-enable [[clang::musttail]] on 64-bit Android.
Our issues with [[clang::musttail]] on Android appear to be
similar to b/241922611, which only affects arm-v7 (32-bit).
Rather than disabling [[clang::musttail]] for all Android
devices, we can scope the mitigation to 32-bit ARM instead.
(Unfortunately, this still leaves Chrome on Android
impacted until go/64bit-clank lands.)
Unfortunately, there isn't a Chromium Canary option here, but
if this doesn't work as expected, it will prevent skcms from
rolling; if this occurs we can just roll this CL back.
Bug: chromium:1504548
Bug: chromium:1504823
Bug: chromium:1504816
Change-Id: Iaf21319cb21fd9e56ce220c3e96491103ddb474a
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/785177
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/src/skcms_internals.h b/src/skcms_internals.h
index 9ea8f64..ecb16b6 100644
--- a/src/skcms_internals.h
+++ b/src/skcms_internals.h
@@ -35,14 +35,15 @@
// Known limitations:
// - Sanitizers do not work well with [[clang::musttail]], and corrupt src/dst pointers.
// (https://github.com/llvm/llvm-project/issues/70849)
- // - Clang 18 runs into an ICE on Android with [[clang::musttail]].
+ // - Wasm tail-calls were only introduced in 2023 and aren't a mainstream feature yet.
+ // - Clang 18 runs into an ICE on armv7/androideabi with [[clang::musttail]].
// (http://crbug.com/1504548)
// - Windows builds generate incorrect code with [[clang::musttail]] and crash mysteriously.
- // - Wasm tail-calls were only introduced in 2023 and aren't a mainstream feature yet.
+ // (http://crbug.com/1505442)
#if __has_cpp_attribute(clang::musttail) && !__has_feature(memory_sanitizer) \
&& !__has_feature(address_sanitizer) \
&& !defined(__EMSCRIPTEN__) \
- && !defined(ANDROID) && !defined(__ANDROID__) \
+ && !defined(__arm__) \
&& !defined(_WIN32) && !defined(__SYMBIAN32__)
#define SKCMS_MUSTTAIL [[clang::musttail]]
#else
