Merge "Turn off integer overflow UBSAN checks for hash functions" into main

kongy · Gerrit Code Review · commit 3b1cd386e153 · 2024-02-20T06:23:05.000Z
diff --git a/libs/ui/DisplayIdentification.cpp b/libs/ui/DisplayIdentification.cpp
@@ -47,6 +47,7 @@ uint64_t shiftMix(uint64_t val) {
     return val ^ (val >> 47);
 }
 
+__attribute__((no_sanitize("unsigned-integer-overflow")))
 uint64_t hash64Len16(uint64_t u, uint64_t v) {
     constexpr uint64_t kMul = 0x9ddfea08eb382d69;
     uint64_t a = (u ^ v) * kMul;
@@ -57,6 +58,7 @@ uint64_t hash64Len16(uint64_t u, uint64_t v) {
     return b;
 }
 
+__attribute__((no_sanitize("unsigned-integer-overflow")))
 uint64_t hash64Len0To16(const char* s, uint64_t len) {
     constexpr uint64_t k2 = 0x9ae16a3b2f90404f;
     constexpr uint64_t k3 = 0xc949d7c7509e6557;
@@ -401,4 +403,4 @@ uint64_t cityHash64Len0To16(std::string_view sv) {
     return hash64Len0To16(sv.data(), len);
 }
 
-} // namespace android
+} // namespace android

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ uint64_t shiftMix(uint64_t val) {`
`47`	`47`	`return val ^ (val >> 47);`
`48`	`48`	`}`
`49`	`49`
	`50`	`+__attribute__((no_sanitize("unsigned-integer-overflow")))`
`50`	`51`	`uint64_t hash64Len16(uint64_t u, uint64_t v) {`
`51`	`52`	`constexpr uint64_t kMul = 0x9ddfea08eb382d69;`
`52`	`53`	`uint64_t a = (u ^ v) * kMul;`
`@@ -57,6 +58,7 @@ uint64_t hash64Len16(uint64_t u, uint64_t v) {`
`57`	`58`	`return b;`
`58`	`59`	`}`
`59`	`60`
	`61`	`+__attribute__((no_sanitize("unsigned-integer-overflow")))`
`60`	`62`	`uint64_t hash64Len0To16(const char* s, uint64_t len) {`
`61`	`63`	`constexpr uint64_t k2 = 0x9ae16a3b2f90404f;`
`62`	`64`	`constexpr uint64_t k3 = 0xc949d7c7509e6557;`
`@@ -401,4 +403,4 @@ uint64_t cityHash64Len0To16(std::string_view sv) {`
`401`	`403`	`return hash64Len0To16(sv.data(), len);`
`402`	`404`	`}`
`403`	`405`
`404`		`-} // namespace android`
	`406`	`+} // namespace android`