From 93d58f71134cb97e79c417e540d12940960b529e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 16 Nov 2018 00:47:24 +0000 Subject: [PATCH] Re-apply r346985: [ADT] Drop llvm::Optional clang-specific optimization for trivially copyable types Remove a test case that was added with the optimization we are now removing. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@347004 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/Optional.h | 18 ------------------ unittests/ADT/OptionalTest.cpp | 8 -------- 2 files changed, 26 deletions(-) diff --git a/include/llvm/ADT/Optional.h b/include/llvm/ADT/Optional.h index 353e5d0..9fe9b28 100644 --- a/include/llvm/ADT/Optional.h +++ b/include/llvm/ADT/Optional.h @@ -108,24 +108,6 @@ template struct OptionalStorage { } }; -#if !defined(__GNUC__) || defined(__clang__) // GCC up to GCC7 miscompiles this. -/// Storage for trivially copyable types only. -template struct OptionalStorage { - AlignedCharArrayUnion storage; - bool hasVal = false; - - OptionalStorage() = default; - - OptionalStorage(const T &y) : hasVal(true) { new (storage.buffer) T(y); } - OptionalStorage &operator=(const T &y) { - *reinterpret_cast(storage.buffer) = y; - hasVal = true; - return *this; - } - - void reset() { hasVal = false; } -}; -#endif } // namespace optional_detail template class Optional { diff --git a/unittests/ADT/OptionalTest.cpp b/unittests/ADT/OptionalTest.cpp index 2e09c53..20bc9da 100644 --- a/unittests/ADT/OptionalTest.cpp +++ b/unittests/ADT/OptionalTest.cpp @@ -518,13 +518,5 @@ TEST_F(OptionalTest, OperatorGreaterEqual) { CheckRelation(InequalityLhs, InequalityRhs, !IsLess); } -#if __has_feature(is_trivially_copyable) && defined(_LIBCPP_VERSION) -static_assert(std::is_trivially_copyable>::value, - "Should be trivially copyable"); -static_assert( - !std::is_trivially_copyable>::value, - "Shouldn't be trivially copyable"); -#endif - } // end anonymous namespace -- 1.8.3.1