diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-06-21 18:46:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-06-25 17:31:22 +0000 |
| commit | 858dc467c63c1be107808bcef9198591416ac71c (patch) | |
| tree | 3f920b95db53b4d46e5caf72eb555f08f8bfb264 | |
| parent | ade910f43b70b0ced99a2c31bd965a5637caf320 (diff) | |
| download | src-858dc467c63c1be107808bcef9198591416ac71c.tar.gz src-858dc467c63c1be107808bcef9198591416ac71c.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.cpp | 2 |
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++. |