summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2014-06-03 08:40:27 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2014-06-03 08:40:27 +0000
commit9213a6bfa4dd0d3c7e386ff7208f5e6a9124a5d6 (patch)
treeaef043fbc7245aa94a3053b26ea119a043186cec /clang/lib
parent454a7cdfb35e492e0539cbc75452229d3a5c5f54 (diff)
downloadbcm5719-llvm-9213a6bfa4dd0d3c7e386ff7208f5e6a9124a5d6.tar.gz
bcm5719-llvm-9213a6bfa4dd0d3c7e386ff7208f5e6a9124a5d6.zip
Remove incorrect assertion.
llvm-svn: 210092
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/CodeGen/CGExprAgg.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index 760e6f15fa7..4cb81b54cd5 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -439,10 +439,9 @@ void AggExprEmitter::EmitArrayInit(llvm::Value *DestPtr, llvm::ArrayType *AType,
// type is an array (or array of array, etc.) of class type.
Expr *filler = E->getArrayFiller();
bool hasTrivialFiller = true;
- if (CXXConstructExpr *cons = dyn_cast_or_null<CXXConstructExpr>(filler)) {
- assert(cons->getConstructor()->isDefaultConstructor());
- hasTrivialFiller = cons->getConstructor()->isTrivial();
- }
+ if (CXXConstructExpr *cons = dyn_cast_or_null<CXXConstructExpr>(filler))
+ hasTrivialFiller = cons->getConstructor()->isDefaultConstructor() &&
+ cons->getConstructor()->isTrivial();
// Any remaining elements need to be zero-initialized, possibly
// using the filler expression. We can skip this if the we're
OpenPOWER on IntegriCloud