summaryrefslogtreecommitdiff
path: root/include/utils
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-08-24 16:02:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-24 16:02:36 +0000
commit50659902d2df4d6fbc738b3c17ebc38d1060a140 (patch)
tree9d6395ef2de30bdecd5d2930f19a20c9cbfe1580 /include/utils
parentef39b2613c0f2b9a9c98c1f01c8f4bcc30c8d1ae (diff)
parent4f0a7cb8e15ce50f7da6a71c96335bd0b7394492 (diff)
am 4f0a7cb8: am 786e5e26: Merge "libutils: cleanups for -fsanitize=integer"
* commit '4f0a7cb8e15ce50f7da6a71c96335bd0b7394492': libutils: cleanups for -fsanitize=integer
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/JenkinsHash.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/utils/JenkinsHash.h b/include/utils/JenkinsHash.h
index 7da5dbd6a..027c10c7e 100644
--- a/include/utils/JenkinsHash.h
+++ b/include/utils/JenkinsHash.h
@@ -29,6 +29,9 @@ namespace android {
/* The Jenkins hash of a sequence of 32 bit words A, B, C is:
* Whiten(Mix(Mix(Mix(0, A), B), C)) */
+#ifdef __clang__
+__attribute__((no_sanitize("integer")))
+#endif
inline uint32_t JenkinsHashMix(uint32_t hash, uint32_t data) {
hash += data;
hash += (hash << 10);