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. llvm-svn: 347004 GitOrigin-RevId: fb7d1a92e6198651e92ace2e6224b2d8d33fc644
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 @@ } }; -#if !defined(__GNUC__) || defined(__clang__) // GCC up to GCC7 miscompiles this. -/// Storage for trivially copyable types only. -template <typename T> struct OptionalStorage<T, true> { - AlignedCharArrayUnion<T> storage; - bool hasVal = false; - - OptionalStorage() = default; - - OptionalStorage(const T &y) : hasVal(true) { new (storage.buffer) T(y); } - OptionalStorage &operator=(const T &y) { - *reinterpret_cast<T *>(storage.buffer) = y; - hasVal = true; - return *this; - } - - void reset() { hasVal = false; } -}; -#endif } // namespace optional_detail template <typename T> 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 @@ CheckRelation<GreaterEqual>(InequalityLhs, InequalityRhs, !IsLess); } -#if __has_feature(is_trivially_copyable) && defined(_LIBCPP_VERSION) -static_assert(std::is_trivially_copyable<Optional<int>>::value, - "Should be trivially copyable"); -static_assert( - !std::is_trivially_copyable<Optional<NonDefaultConstructible>>::value, - "Shouldn't be trivially copyable"); -#endif - } // end anonymous namespace