From 3cf7619a099121e328f3824997d2e6d9b4438681 Mon Sep 17 00:00:00 2001 From: Serge Guelton Date: Thu, 14 Feb 2019 19:41:44 +0000 Subject: [PATCH] Optional specialization for trivially copyable types, part2 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@354055 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/Optional.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/llvm/ADT/Optional.h b/include/llvm/ADT/Optional.h index c628df9d711..f7d35c745fb 100644 --- a/include/llvm/ADT/Optional.h +++ b/include/llvm/ADT/Optional.h @@ -116,7 +116,9 @@ template struct OptionalStorage { 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(&y), sizeof(T)); + } OptionalStorage(const OptionalStorage &O) = default; OptionalStorage(T &&y) : hasVal(true) { std::memcpy(storage.buffer, reinterpret_cast(&y), sizeof(T)); -- 2.40.0