Merge "Upgrade zlib to 14dd4c44" am:...

Merge "Upgrade zlib to 14dd4c44" am: 46e555b1 am: 1ff118d1 am: 0e5194fa

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592925



Change-Id: I228a561919465ead0a0ba682d6df3c1882cf1fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

METADATA

@@ -9,11 +9,11 @@ third_party {
     type: GIT
     value: "https://chromium.googlesource.com/chromium/src/third_party/zlib/"
   }
-  version: "b890619bc2b193b8fbe9c1c053f4cd19a9791d92"
+  version: "14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f"
   license_type: NOTICE
   last_upgrade_date {
     year: 2023
-    month: 4
-    day: 4
+    month: 5
+    day: 16
   }
 }

contrib/tests/fuzzers/inflate_with_header_fuzzer.cc

@@ -12,7 +12,7 @@
 
 #include <fuzzer/FuzzedDataProvider.h>
 
-#include "third_party/zlib/zlib.h"
+#include "zlib.h"
 
 // Fuzzer builds often have NDEBUG set, so roll our own assert macro.
 #define ASSERT(cond)                                                           \

crc_folding.c

@@ -435,7 +435,10 @@ unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s)
     unsigned crc;
     __m128i x_tmp0, x_tmp1, x_tmp2, crc_fold;
 
-    CRC_LOAD(s)
+    __m128i xmm_crc0 = _mm_loadu_si128((__m128i *)s->crc0 + 0);
+    __m128i xmm_crc1 = _mm_loadu_si128((__m128i *)s->crc0 + 1);
+    __m128i xmm_crc2 = _mm_loadu_si128((__m128i *)s->crc0 + 2);
+    __m128i xmm_crc3 = _mm_loadu_si128((__m128i *)s->crc0 + 3);
 
     /*
      * k1
@@ -491,7 +494,6 @@ unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s)
 
     crc = _mm_extract_epi32(xmm_crc3, 2);
     return ~crc;
-    CRC_SAVE(s)
 }
 
 #endif  /* CRC32_SIMD_SSE42_PCLMUL */