diff options
| author | Dominic Chen <ddchen@apple.com> | 2022-04-19 01:05:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-19 01:05:29 +0000 |
| commit | 36fcc61e374857174b17e837e5f517380ab33b3a (patch) | |
| tree | 97cf6c2b12ff78bfb0af0a3cc6dec839d60f6399 | |
| parent | 59c1125143ef32395af9766556508b757ce366ad (diff) | |
| parent | 72e65e00673d93584a3f315559a68709d14f306f (diff) | |
| download | scudo-36fcc61e374857174b17e837e5f517380ab33b3a.tar.gz | |
[scudo] Wrap clang pragma to avoid GCC error am: eed5c65736 am: baa8a79e17 am: 72e65e0067
Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/2066953
Change-Id: I612fdf0fc5637b55fd04c9dffbf61ce37eee1186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | standalone/memtag.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/standalone/memtag.h b/standalone/memtag.h index 6e2f887fdec..966bf6b9ee2 100644 --- a/standalone/memtag.h +++ b/standalone/memtag.h @@ -301,6 +301,7 @@ inline NORETURN uptr loadTag(uptr Ptr) { #endif +#if __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wmissing-noreturn" inline void setRandomTag(void *Ptr, uptr Size, uptr ExcludeMask, @@ -309,6 +310,7 @@ inline void setRandomTag(void *Ptr, uptr Size, uptr ExcludeMask, *TaggedEnd = storeTags(*TaggedBegin, *TaggedBegin + Size); } #pragma clang diagnostic pop +#endif inline void *untagPointer(void *Ptr) { return reinterpret_cast<void *>(untagPointer(reinterpret_cast<uptr>(Ptr))); |