aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2021-06-21 18:46:34 +0000
committerDimitry Andric <dim@FreeBSD.org>2021-06-25 17:31:48 +0000
commit591bd6a9b85d233bbef5eeaae46454f5994bf42f (patch)
tree93aa060e2b3c26068bca3d7bd8315dfe04909608
parent75befde07bdf1e3059c8c5e8928a695e5e59d698 (diff)
downloadsrc-591bd6a9b85d233bbef5eeaae46454f5994bf42f.tar.gz
src-591bd6a9b85d233bbef5eeaae46454f5994bf42f.zip
Fix clang assertion while building recent www/chromium
Merge commit c8227f06b335 from llvm git (by Arthur Eubanks): [clang] Don't assert in EmitAggregateCopy on trivial_abi types Fixes PR42961. Reviewed By: rnk Differential Revision: https://reviews.llvm.org/D97872 PR: 256721, 255570 Reported by: jbeich (cherry picked from commit e7e517981a6591c79fb49cd8810361b0f3ad5983)
-rw-r--r--contrib/llvm-project/clang/lib/CodeGen/CGExprAgg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm-project/clang/lib/CodeGen/CGExprAgg.cpp b/contrib/llvm-project/clang/lib/CodeGen/CGExprAgg.cpp
index 8de609a2ccd9..53dbfecfc538 100644
--- a/contrib/llvm-project/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/contrib/llvm-project/clang/lib/CodeGen/CGExprAgg.cpp
@@ -1914,7 +1914,7 @@ void CodeGenFunction::EmitAggregateCopy(LValue Dest, LValue Src, QualType Ty,
Record->hasTrivialCopyAssignment() ||
Record->hasTrivialMoveConstructor() ||
Record->hasTrivialMoveAssignment() ||
- Record->isUnion()) &&
+ Record->hasAttr<TrivialABIAttr>() || Record->isUnion()) &&
"Trying to aggregate-copy a type without a trivial copy/move "
"constructor or assignment operator");
// Ignore empty classes in C++.