refactor: Fix implicit-signed-integer-truncation in cuckoocache.h

MarcoFalke · MarcoFalke · commit fa7da227daf8 · 2021-11-29T14:32:51.000+01:00
diff --git a/src/cuckoocache.h b/src/cuckoocache.h
@@ -89,7 +89,7 @@ class bit_packed_atomic_flags
      */
     inline void bit_set(uint32_t s)
     {
-        mem[s >> 3].fetch_or(1 << (s & 7), std::memory_order_relaxed);
+        mem[s >> 3].fetch_or(uint8_t(1 << (s & 7)), std::memory_order_relaxed);
     }
 
     /** bit_unset marks an entry as something that should not be overwritten.
@@ -100,7 +100,7 @@ class bit_packed_atomic_flags
      */
     inline void bit_unset(uint32_t s)
     {
-        mem[s >> 3].fetch_and(~(1 << (s & 7)), std::memory_order_relaxed);
+        mem[s >> 3].fetch_and(uint8_t(~(1 << (s & 7))), std::memory_order_relaxed);
     }
 
     /** bit_is_set queries the table for discardability at `s`.
diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
@@ -86,7 +86,6 @@ implicit-signed-integer-truncation:addrman.cpp
 implicit-signed-integer-truncation:addrman.h
 implicit-signed-integer-truncation:chain.h
 implicit-signed-integer-truncation:crypto/
-implicit-signed-integer-truncation:cuckoocache.h
 implicit-signed-integer-truncation:leveldb/
 implicit-signed-integer-truncation:node/miner.cpp
 implicit-signed-integer-truncation:net.cpp

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ class bit_packed_atomic_flags`
`89`	`89`	`*/`
`90`	`90`	`inline void bit_set(uint32_t s)`
`91`	`91`	`{`
`92`		`- mem[s >> 3].fetch_or(1 << (s & 7), std::memory_order_relaxed);`
	`92`	`+ mem[s >> 3].fetch_or(uint8_t(1 << (s & 7)), std::memory_order_relaxed);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/** bit_unset marks an entry as something that should not be overwritten.`
`@@ -100,7 +100,7 @@ class bit_packed_atomic_flags`
`100`	`100`	`*/`
`101`	`101`	`inline void bit_unset(uint32_t s)`
`102`	`102`	`{`
`103`		`- mem[s >> 3].fetch_and(~(1 << (s & 7)), std::memory_order_relaxed);`
	`103`	`+ mem[s >> 3].fetch_and(uint8_t(~(1 << (s & 7))), std::memory_order_relaxed);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	/** bit_is_set queries the table for discardability at `s`.