diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2023-01-10 22:46:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-10 22:46:59 +0000 |
| commit | 65ebc43f8f56f15cc8d72593c9c0cbec4ea422d9 (patch) | |
| tree | 11db74e38a85fb11d4d981a03955aefaa5e69495 | |
| parent | 085abe86b833581670fc51329ba22ace09009ab3 (diff) | |
| parent | f1b7597c904b1c92f75409463ad28e4565162195 (diff) | |
| download | zlib-65ebc43f8f56f15cc8d72593c9c0cbec4ea422d9.tar.gz | |
Merge "Upgrade zlib to fa5dc4750029333c2486efa38eec7d13890108ed"main-16k-with-phones
| -rw-r--r-- | METADATA | 8 | ||||
| -rw-r--r-- | contrib/optimizations/chunkcopy.h | 2 | ||||
| -rw-r--r-- | contrib/optimizations/insert_string.h | 5 |
3 files changed, 7 insertions, 8 deletions
@@ -9,11 +9,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/chromium/src/third_party/zlib/" } - version: "d866d41e168ec04545bb17031fa911007a0581f4" + version: "fa5dc4750029333c2486efa38eec7d13890108ed" license_type: NOTICE last_upgrade_date { - year: 2022 - month: 11 - day: 16 + year: 2023 + month: 1 + day: 9 } } diff --git a/contrib/optimizations/chunkcopy.h b/contrib/optimizations/chunkcopy.h index db3c861..f40546d 100644 --- a/contrib/optimizations/chunkcopy.h +++ b/contrib/optimizations/chunkcopy.h @@ -60,7 +60,7 @@ Z_STATIC_ASSERT(vector_128_bits_wide, * instruction appropriate for the z_vec128i_t type. */ static inline z_vec128i_t loadchunk( - const unsigned char FAR* s) { + const unsigned char FAR* s) Z_DISABLE_MSAN { z_vec128i_t v; Z_BUILTIN_MEMCPY(&v, s, sizeof(v)); return v; diff --git a/contrib/optimizations/insert_string.h b/contrib/optimizations/insert_string.h index 2a04f69..c6a296a 100644 --- a/contrib/optimizations/insert_string.h +++ b/contrib/optimizations/insert_string.h @@ -57,10 +57,9 @@ TARGET_CPU_WITH_CRC local INLINE Pos insert_string_simd(deflate_state* const s, const Pos str) { Pos ret; - unsigned *ip, val, h = 0; + unsigned val, h = 0; - ip = (unsigned*)&s->window[str]; - val = *ip; + zmemcpy(&val, &s->window[str], sizeof(val)); if (s->level >= 6) val &= 0xFFFFFF; |