Use U32 for extract index

danlark1 · danlark1 · commit c3f04cd409c2 · 2026-03-06T13:43:17.000Z
diff --git a/lib/compress/zstd_compress_internal.h b/lib/compress/zstd_compress_internal.h
@@ -1096,8 +1096,8 @@ MEM_STATIC FORCE_INLINE_ATTR size_t ZSTD_extractHash(size_t hashAndTag, U32 tagB
     return hashAndTag & (((U64)1 << hashBits) - 1);
 }
 
-MEM_STATIC FORCE_INLINE_ATTR size_t ZSTD_extractIndex(size_t indexAndTag, U32 tagBits) {
-    return indexAndTag & (((U32)1 << (32 - tagBits)) - 1);
+MEM_STATIC FORCE_INLINE_ATTR U32 ZSTD_extractIndex(size_t indexAndTag, U32 tagBits) {
+    return (U32)(indexAndTag & (((U32)1 << (32 - tagBits)) - 1));
 }
 
 MEM_STATIC FORCE_INLINE_ATTR U32 ZSTD_extractTagFromHash(size_t hashAndTag, U32 tagBits, U32 hashBits) {
@@ -1122,8 +1122,8 @@ MEM_STATIC FORCE_INLINE_ATTR size_t ZSTD_extractHash(size_t hashAndTag, U32 tagB
     return hashAndTag >> tagBits;
 }
 
-MEM_STATIC FORCE_INLINE_ATTR size_t ZSTD_extractIndex(size_t indexAndTag, U32 tagBits) {
-    return ZSTD_extractHash(indexAndTag, tagBits, 0);
+MEM_STATIC FORCE_INLINE_ATTR U32 ZSTD_extractIndex(size_t indexAndTag, U32 tagBits) {
+    return (U32)ZSTD_extractHash(indexAndTag, tagBits, 0);
 }
 
 MEM_STATIC FORCE_INLINE_ATTR U32 ZSTD_extractTagFromHash(size_t hashAndTag, U32 tagBits, U32 hashBits) {

Original file line number	Diff line number	Diff line change
`@@ -1096,8 +1096,8 @@ MEM_STATIC FORCE_INLINE_ATTR size_t ZSTD_extractHash(size_t hashAndTag, U32 tagB`
`1096`	`1096`	`return hashAndTag & (((U64)1 << hashBits) - 1);`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`		`-MEM_STATIC FORCE_INLINE_ATTR size_t ZSTD_extractIndex(size_t indexAndTag, U32 tagBits) {`
`1100`		`- return indexAndTag & (((U32)1 << (32 - tagBits)) - 1);`
	`1099`	`+MEM_STATIC FORCE_INLINE_ATTR U32 ZSTD_extractIndex(size_t indexAndTag, U32 tagBits) {`
	`1100`	`+ return (U32)(indexAndTag & (((U32)1 << (32 - tagBits)) - 1));`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`	`1103`	`MEM_STATIC FORCE_INLINE_ATTR U32 ZSTD_extractTagFromHash(size_t hashAndTag, U32 tagBits, U32 hashBits) {`
`@@ -1122,8 +1122,8 @@ MEM_STATIC FORCE_INLINE_ATTR size_t ZSTD_extractHash(size_t hashAndTag, U32 tagB`
`1122`	`1122`	`return hashAndTag >> tagBits;`
`1123`	`1123`	`}`
`1124`	`1124`
`1125`		`-MEM_STATIC FORCE_INLINE_ATTR size_t ZSTD_extractIndex(size_t indexAndTag, U32 tagBits) {`
`1126`		`- return ZSTD_extractHash(indexAndTag, tagBits, 0);`
	`1125`	`+MEM_STATIC FORCE_INLINE_ATTR U32 ZSTD_extractIndex(size_t indexAndTag, U32 tagBits) {`
	`1126`	`+ return (U32)ZSTD_extractHash(indexAndTag, tagBits, 0);`
`1127`	`1127`	`}`
`1128`	`1128`
`1129`	`1129`	`MEM_STATIC FORCE_INLINE_ATTR U32 ZSTD_extractTagFromHash(size_t hashAndTag, U32 tagBits, U32 hashBits) {`