Revert r353962
Specialization of Optional for trivially copyable types yields failure on the buildbots I fail to reproduce locally.
Better safe than sorry, reverting.
llvm-svn: 353982
diff --git a/llvm/include/llvm/ADT/Optional.h b/llvm/include/llvm/ADT/Optional.h
index d7b9d5c..25a3185 100644
--- a/llvm/include/llvm/ADT/Optional.h
+++ b/llvm/include/llvm/ADT/Optional.h
@@ -29,61 +29,33 @@
class raw_ostream;
namespace optional_detail {
-template <typename T> struct OptionalStorageBase {
+/// Storage for any type.
+template <typename T, bool = is_trivially_copyable<T>::value> struct OptionalStorage {
AlignedCharArrayUnion<T> storage;
bool hasVal = false;
- OptionalStorageBase() = default;
- OptionalStorageBase(const T &y) : hasVal(true) { new (storage.buffer) T(y); }
- OptionalStorageBase(T &&y) : hasVal(true) {
- new (storage.buffer) T(std::move(y));
- }
-
- T *getPointer() {
- assert(hasVal);
- return reinterpret_cast<T *>(storage.buffer);
- }
- const T *getPointer() const {
- assert(hasVal);
- return reinterpret_cast<const T *>(storage.buffer);
- }
- OptionalStorageBase &operator=(T &&y) {
- hasVal = true;
- new (this->storage.buffer) T(std::move(y));
- return *this;
- }
- OptionalStorageBase &operator=(const T &y) {
- hasVal = true;
- new (this->storage.buffer) T(y);
- return *this;
- }
- void reset() { this->hasVal = false; }
-};
-
-/// Storage for any type.
-template <typename T, bool = is_trivially_copyable<T>::value>
-struct OptionalStorage : OptionalStorageBase<T> {
OptionalStorage() = default;
- OptionalStorage(const T &y) : OptionalStorageBase<T>(y) {}
- OptionalStorage(const OptionalStorage &O) : OptionalStorageBase<T>() {
- this->hasVal = O.hasVal;
- if (this->hasVal)
- new (this->storage.buffer) T(*O.getPointer());
+ OptionalStorage(const T &y) : hasVal(true) { new (storage.buffer) T(y); }
+ OptionalStorage(const OptionalStorage &O) : hasVal(O.hasVal) {
+ if (hasVal)
+ new (storage.buffer) T(*O.getPointer());
}
- OptionalStorage(T &&y) : OptionalStorageBase<T>(std::move(y)) {}
- OptionalStorage(OptionalStorage &&O) : OptionalStorageBase<T>() {
- this->hasVal = O.hasVal;
+ OptionalStorage(T &&y) : hasVal(true) {
+ new (storage.buffer) T(std::forward<T>(y));
+ }
+ OptionalStorage(OptionalStorage &&O) : hasVal(O.hasVal) {
if (O.hasVal) {
- new (this->storage.buffer) T(std::move(*O.getPointer()));
+ new (storage.buffer) T(std::move(*O.getPointer()));
}
}
OptionalStorage &operator=(T &&y) {
- if (this->hasVal)
- *this->getPointer() = std::move(y);
+ if (hasVal)
+ *getPointer() = std::move(y);
else {
- OptionalStorageBase<T>::operator=(std::move(y));
+ new (storage.buffer) T(std::move(y));
+ hasVal = true;
}
return *this;
}
@@ -102,10 +74,11 @@
// requirements (notably: the existence of a default ctor) when implemented
// in that way. Careful SFINAE to avoid such pitfalls would be required.
OptionalStorage &operator=(const T &y) {
- if (this->hasVal)
- *this->getPointer() = y;
+ if (hasVal)
+ *getPointer() = y;
else {
- OptionalStorageBase<T>::operator=(y);
+ new (storage.buffer) T(y);
+ hasVal = true;
}
return *this;
}
@@ -120,30 +93,20 @@
~OptionalStorage() { reset(); }
void reset() {
- if (this->hasVal) {
- (*this->getPointer()).~T();
+ if (hasVal) {
+ (*getPointer()).~T();
+ hasVal = false;
}
- OptionalStorageBase<T>::reset();
}
-};
-template <typename T> struct OptionalStorage<T, true> : OptionalStorageBase<T> {
- OptionalStorage() = default;
- OptionalStorage(const T &y) : OptionalStorageBase<T>(y) {}
- OptionalStorage(const OptionalStorage &O) = default;
- OptionalStorage(T &&y) : OptionalStorageBase<T>(std::move(y)) {}
- OptionalStorage(OptionalStorage &&O) = default;
- OptionalStorage &operator=(T &&y) {
- OptionalStorageBase<T>::operator=(std::move(y));
- return *this;
+ T *getPointer() {
+ assert(hasVal);
+ return reinterpret_cast<T *>(storage.buffer);
}
- OptionalStorage &operator=(OptionalStorage &&O) = default;
- OptionalStorage &operator=(const T &y) {
- OptionalStorageBase<T>::operator=(y);
- return *this;
+ const T *getPointer() const {
+ assert(hasVal);
+ return reinterpret_cast<const T *>(storage.buffer);
}
- OptionalStorage &operator=(const OptionalStorage &O) = default;
- ~OptionalStorage() = default;
};
} // namespace optional_detail
diff --git a/llvm/unittests/ADT/OptionalTest.cpp b/llvm/unittests/ADT/OptionalTest.cpp
index c39b672..98adacc 100644
--- a/llvm/unittests/ADT/OptionalTest.cpp
+++ b/llvm/unittests/ADT/OptionalTest.cpp
@@ -18,12 +18,6 @@
namespace {
-static_assert(llvm::is_trivially_copyable<Optional<int>>::value,
- "trivially copyable");
-
-static_assert(llvm::is_trivially_copyable<Optional<std::array<int, 3>>>::value,
- "trivially copyable");
-
struct NonDefaultConstructible {
static unsigned CopyConstructions;
static unsigned Destructions;
@@ -51,10 +45,6 @@
unsigned NonDefaultConstructible::Destructions = 0;
unsigned NonDefaultConstructible::CopyAssignments = 0;
-static_assert(
- !llvm::is_trivially_copyable<Optional<NonDefaultConstructible>>::value,
- "not trivially copyable");
-
// Test fixture
class OptionalTest : public testing::Test {
};
@@ -213,10 +203,6 @@
};
unsigned MultiArgConstructor::Destructions = 0;
-static_assert(
- !llvm::is_trivially_copyable<Optional<MultiArgConstructor>>::value,
- "not trivially copyable");
-
TEST_F(OptionalTest, Emplace) {
MultiArgConstructor::ResetCounts();
Optional<MultiArgConstructor> A;
@@ -264,9 +250,6 @@
unsigned MoveOnly::Destructions = 0;
unsigned MoveOnly::MoveAssignments = 0;
-static_assert(!llvm::is_trivially_copyable<Optional<MoveOnly>>::value,
- "not trivially copyable");
-
TEST_F(OptionalTest, MoveOnlyNull) {
MoveOnly::ResetCounts();
Optional<MoveOnly> O;
@@ -368,9 +351,6 @@
unsigned Immovable::Constructions = 0;
unsigned Immovable::Destructions = 0;
-static_assert(!llvm::is_trivially_copyable<Optional<Immovable>>::value,
- "not trivially copyable");
-
TEST_F(OptionalTest, ImmovableEmplace) {
Optional<Immovable> A;
Immovable::ResetCounts();
