Put [[no_unique_address]] back on the Array's array storage

MSVC has fixed the bug where [[msvc::no_unique_address]] on an array would break its alignment. Previous MSVC versions can't even compile Subspace so we don't need to worry about supporting them here.
chromium · Nov 25, 2023 · c59c89c · c59c89c
1 parent 5f26f53
commit c59c89c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/sus/collections/array.h b/sus/collections/array.h
@@ -54,9 +54,8 @@ namespace __private {
 
 template <class T, size_t N>
 struct Storage final {
-  sus_msvc_bug_10416202_else(
-      [[sus_no_unique_address]]) sus::iter::IterRefCounter iter_refs_;
-  T data_[N];
+  [[sus_no_unique_address]] sus::iter::IterRefCounter iter_refs_;
+  [[sus_no_unique_address]] T data_[N];
 };
 
 template <class T>

diff --git a/sus/collections/invalidation_off_size_unittest.cc b/sus/collections/invalidation_off_size_unittest.cc
@@ -24,9 +24,7 @@ using sus::Slice;
 
 constexpr usize array_padding = 0u
     // No support for no_unique_address in clang-cl.
-    sus_clang_bug_49358(+sizeof(i32))
-    // MSVC bug with no_unique_address and arrays, so not used here.
-    sus_clang_bug_49358_else(sus_msvc_bug_10416202(+sizeof(i32)));
+    sus_clang_bug_49358(+sizeof(i32));
 
 static_assert(alignof(Array<i32, 5>) == alignof(i32));
 static_assert(sizeof(Array<i32, 5>) == sizeof(i32) * 5 + array_padding);