StrictProvenance: deorbit metadata mixins

microsoft · Dec 14, 2022 · 5e130c6 · 5e130c6
1 parent de465d9
commit 5e130c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 98 deletions.
diff --git a/src/snmalloc/backend_helpers/cheri_slabmetadata_mixin.h b/src/snmalloc/backend_helpers/cheri_slabmetadata_mixin.h
diff --git a/src/snmalloc/backend_helpers/defaultpagemapentry.h b/src/snmalloc/backend_helpers/defaultpagemapentry.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../mem/mem.h"
-#include "cheri_slabmetadata_mixin.h"
 
 namespace snmalloc
 {
@@ -65,19 +64,9 @@ namespace snmalloc
     SNMALLOC_FAST_PATH DefaultPagemapEntryT() = default;
   };
 
-  class StrictProvenanceSlabMetadata
-  : public StrictProvenanceSlabMetadataMixin<
-      FrontendSlabMetadata<StrictProvenanceSlabMetadata>>
+  class DefaultSlabMetadata : public FrontendSlabMetadata<DefaultSlabMetadata>
   {};
 
-  class LaxProvenanceSlabMetadata
-  : public LaxProvenanceSlabMetadataMixin<
-      FrontendSlabMetadata<LaxProvenanceSlabMetadata>>
-  {};
-
-  using DefaultPagemapEntry = DefaultPagemapEntryT<std::conditional_t<
-    backend_strict_provenance,
-    StrictProvenanceSlabMetadata,
-    LaxProvenanceSlabMetadata>>;
+  using DefaultPagemapEntry = DefaultPagemapEntryT<DefaultSlabMetadata>;
 
 } // namespace snmalloc