git: 858dc467c63c - stable/12 - Fix clang assertion while building recent www/chromium

[Dimitry Andric]

The branch stable/12 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=858dc467c63c1be107808bcef9198591416ac71c

commit 858dc467c63c1be107808bcef9198591416ac71c
Author:     Dimitry Andric <dim at FreeBSD.org>
AuthorDate: 2021-06-21 18:46:34 +0000
Commit:     Dimitry Andric <dim at FreeBSD.org>
CommitDate: 2021-06-25 17:31:22 +0000

    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)
---
 contrib/llvm-project/clang/lib/CodeGen/CGExprAgg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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++.