Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 522acbfc authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Turn off integer overflow UBSAN checks for hash functions" into main am: 3b1cd386 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2967129



Change-Id: I1eada9da5269992f821633714332f2cf4055e884
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02a9b315 3b1cd386

libs/ui/DisplayIdentification.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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;