commit 419bd0941514bad6fa9d66e6f76360791389e7e0
author Richard Smith <richard-llvm@metafoo.co.uk> Wed Apr 29 19:26:57 2015 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed Apr 29 19:26:57 2015 +0000
tree eac43af91c8b6458ab4dc6478c239e12534894fd
parent ae7e4995ca2c506200f7673d9161df2d851582fb

PR23373: A defaulted union copy constructor that is not trivial must still be
emitted as a memcpy.

llvm-svn: 236142

clang/lib/CodeGen/CGExprAgg.cpp

diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index b139ef2..2ad5ec3 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -1415,7 +1415,8 @@
       assert((Record->hasTrivialCopyConstructor() || 
               Record->hasTrivialCopyAssignment() ||
               Record->hasTrivialMoveConstructor() ||
-              Record->hasTrivialMoveAssignment()) &&
+              Record->hasTrivialMoveAssignment() ||
+              Record->isUnion()) &&
              "Trying to aggregate-copy a type without a trivial copy/move "
              "constructor or assignment operator");
       // Ignore empty classes in C++.