diff options
| author | hrs <hrs@FreeBSD.org> | 2011-06-16 12:24:02 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-06-16 12:24:02 +0000 |
| commit | 7afd303ca9e45353e1af220a988ddac723fde355 (patch) | |
| tree | 356c3cc3903b4ba969f103c2c6ccc21fc748bdaa /contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp | |
| parent | b2a6f5600367e61c439c79db2317d4619960e2ce (diff) | |
| parent | cc8fba8d7c933e32931cfc80150a2ed465e70825 (diff) | |
| download | FreeBSD-src-7afd303ca9e45353e1af220a988ddac723fde355.zip FreeBSD-src-7afd303ca9e45353e1af220a988ddac723fde355.tar.gz | |
Merge from HEAD@222977.
Diffstat (limited to 'contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp b/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp index 29c7688..d8da642 100644 --- a/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp +++ b/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp @@ -642,7 +642,7 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) { if (const RecordType *RT = CGF.getContext() .getBaseElementType(ElementType)->getAs<RecordType>()) { const CXXRecordDecl *RD = cast<CXXRecordDecl>(RT->getDecl()); - hasNonTrivialCXXConstructor = !RD->hasTrivialConstructor(); + hasNonTrivialCXXConstructor = !RD->hasTrivialDefaultConstructor(); } // FIXME: were we intentionally ignoring address spaces and GC attributes? |
