Optional specialization for trivially copyable types, part2

llvm-svn: 354055

diff --git a/llvm/include/llvm/ADT/Optional.h b/llvm/include/llvm/ADT/Optional.h
index c628df9..f7d35c7 100644 (file)
--- a/llvm/include/llvm/ADT/Optional.h
+++ b/llvm/include/llvm/ADT/Optional.h
@@ -116,7 +116,9 @@ template <typename T> struct OptionalStorage<T, true> {
 
   OptionalStorage() = default;
 
-  OptionalStorage(const T &y) : hasVal(true) { new (storage.buffer) T(y); }
+  OptionalStorage(const T &y) : hasVal(true) {
+    std::memcpy(storage.buffer, reinterpret_cast<char const *>(&y), sizeof(T));
+  }
   OptionalStorage(const OptionalStorage &O) = default;
   OptionalStorage(T &&y) : hasVal(true) {
     std::memcpy(storage.buffer, reinterpret_cast<char*>(&y), sizeof(T));