From d6269c5b7c856c7b066fdbb38d14f069a40e276d Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew@weaselab.dev>
Date: Fri, 1 Nov 2024 15:12:59 -0700
Subject: [PATCH] Use interleaved even if preserve_none is missing

---
 ConflictSet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index 354b603..25cd774 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -4917,7 +4917,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
     check::Context context;
     context.readContext.impl = this;
 
-#if __has_attribute(preserve_none) && __has_attribute(musttail)
+#if __has_attribute(musttail)
     if (count == 1) {
       useSequential(reads, result, count, context);
     } else {
@@ -5134,7 +5134,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
     assert(allPointWrites || sorted);
 #endif
 
-#if __has_attribute(preserve_none) && __has_attribute(musttail)
+#if __has_attribute(musttail)
     constexpr bool kEnableInterleaved = true;
 #else
     constexpr bool kEnableInterleaved = false;