diff --git a/src/hb-cache.hh b/src/hb-cache.hh index 9ac4ab4c0..84df35ebd 100644 --- a/src/hb-cache.hh +++ b/src/hb-cache.hh @@ -94,8 +94,11 @@ struct hb_cache_t { unsigned int k = key & ((1u<> value_bits) != (key >> cache_bits)) + constexpr unsigned int empty = (1ULL << (8 * sizeof (item_t))) - 1; + /* Combine overflow, tag mismatch, and empty checks into one branch. */ + if ((key >> key_bits) | + ((v >> value_bits) ^ (key >> cache_bits)) | + ((key_bits + value_bits - cache_bits == 8 * sizeof (item_t)) && (v == empty))) return false; *value = v & ((1u< +static void +test_cache () +{ + hb_cache_t cache; + unsigned key_max = (1u << key_bits) - 1; + unsigned value = 42; + unsigned keys[] = {0, 1, 255, 256, key_max}; + unsigned overflow_keys[] = {key_max + 1, 32512, 32767, 65535, UINT_MAX}; + + for (unsigned key : keys) + hb_always_assert (!cache.get (key, &value)); + + for (unsigned key : overflow_keys) + if (key > key_max) + { + hb_always_assert (!cache.get (key, &value)); + hb_always_assert (value == 42); + } + + for (unsigned key : keys) + { + cache.set (key, 0); + hb_always_assert (cache.get (key, &value) && value == 0); + } + + cache.set (42, cache.MAX_VALUE); + hb_always_assert (cache.get (42, &value) && value == cache.MAX_VALUE); + + for (unsigned key : overflow_keys) + if (key > key_max) + { + cache.set (key, 0); + hb_always_assert (!cache.get (key, &value)); + } + + cache.set (42, cache.MAX_VALUE + 1); + hb_always_assert (cache.get (42, &value) && value == cache.MAX_VALUE); + + cache.clear (); + for (unsigned key : keys) + hb_always_assert (!cache.get (key, &value)); +} + +template +static void +test_caches () +{ + /* Entries with spare bits, and entries that fill the storage type. */ + test_cache<14, 1, 8, thread_safe> (); + test_cache<14, 1, 7, thread_safe> (); + test_cache<14, 8, 8, thread_safe> (); + test_cache<16, 8, 8, thread_safe> (); + test_cache<24, 8, 8, thread_safe> (); + test_cache<24, 16, 8, thread_safe> (); +} + +int +main (int argc, char **argv) +{ + test_caches (); + test_caches (); +}