diff options
| -rw-r--r-- | llvm/include/llvm/ADT/Optional.h | 18 | ||||
| -rw-r--r-- | llvm/unittests/ADT/OptionalTest.cpp | 8 |
2 files changed, 0 insertions, 26 deletions
diff --git a/llvm/include/llvm/ADT/Optional.h b/llvm/include/llvm/ADT/Optional.h index 353e5d0ec9d..9fe9b2824ad 100644 --- a/llvm/include/llvm/ADT/Optional.h +++ b/llvm/include/llvm/ADT/Optional.h @@ -108,24 +108,6 @@ template <typename T, bool IsPodLike> struct OptionalStorage { } }; -#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/llvm/unittests/ADT/OptionalTest.cpp b/llvm/unittests/ADT/OptionalTest.cpp index 2e09c5340fa..20bc9da4d59 100644 --- a/llvm/unittests/ADT/OptionalTest.cpp +++ b/llvm/unittests/ADT/OptionalTest.cpp @@ -518,13 +518,5 @@ TEST_F(OptionalTest, OperatorGreaterEqual) { 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 |
