Placate some compiler errors on CHERI

2021-10-18 22:03:31 +01:00
parent fa4560801a
commit fe43f0bea8
2 changed files with 5 additions and 2 deletions
--- a/src/mem/metaslab.h
+++ b/src/mem/metaslab.h
@@ -283,7 +283,10 @@ namespace snmalloc

    [[nodiscard]] SNMALLOC_FAST_PATH sizeclass_t get_sizeclass() const
    {
-      return remote_and_sizeclass & (alignof(RemoteAllocator) - 1);
+      // TODO: perhaps remove static_cast with resolution of
+      // https://github.com/CTSRD-CHERI/llvm-project/issues/588
+      return static_cast<sizeclass_t>(remote_and_sizeclass) &
+        (alignof(RemoteAllocator) - 1);
    }
  };