From 5b205ff474120e086435724dc04f784b784fdd1a Mon Sep 17 00:00:00 2001
From: ogiroux <ogiroux@gmail.com>
Date: Wed, 16 Sep 2020 16:12:10 -0700
Subject: [PATCH] Commenting out atomics with padding to unbreak MSAN tests

---
 .../atomics.types.operations.req/atomic_helpers.h      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_helpers.h b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_helpers.h
index d06cca9..c248e3a 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_helpers.h
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.req/atomic_helpers.h
@@ -23,9 +23,13 @@ struct UserAtomicType
     { return x.i == y.i; }
 };
 
+/*
+
+Enable these once we have P0528 
+
 struct WeirdUserAtomicType
 {
-    char i, j, k; /* the 3 chars of doom */
+    char i, j, k; // the 3 chars of doom
 
     explicit WeirdUserAtomicType(int d = 0) TEST_NOEXCEPT : i(d) {}
 
@@ -35,7 +39,7 @@ struct WeirdUserAtomicType
 
 struct PaddedUserAtomicType
 {
-    char i; int j; /* probably lock-free? */
+    char i; int j; // probably lock-free?
 
     explicit PaddedUserAtomicType(int d = 0) TEST_NOEXCEPT : i(d) {}
 
@@ -43,6 +47,8 @@ struct PaddedUserAtomicType
     { return x.i == y.i; }
 };
 
+*/
+
 struct LargeUserAtomicType
 {
     int i, j[127]; /* decidedly not lock-free */
@@ -89,15 +95,19 @@ struct TestEachAtomicType {
     void operator()() const {
         TestEachIntegralType<TestFunctor>()();
         TestFunctor<UserAtomicType>()();
-        TestFunctor<PaddedUserAtomicType>()();
 #ifndef __APPLE__
         /*
             These aren't going to be lock-free,
             so some libatomic.a is necessary.
         */
-        //TestFunctor<WeirdUserAtomicType>()(); //< Actually, nobody is ready for this until P0528
         TestFunctor<LargeUserAtomicType>()();
 #endif
+/*
+    Enable these once we have P0528 
+    
+        TestFunctor<PaddedUserAtomicType>()();
+        TestFunctor<WeirdUserAtomicType>()();
+*/
         TestFunctor<int*>()();
         TestFunctor<const int*>()();
         TestFunctor<float>()();
-- 
2.7.4