summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2015-09-04 21:39:15 +0000
committerReid Kleckner <rnk@google.com>2015-09-04 21:39:15 +0000
commit5ee4b9a11fb70efbbccb9e717012cb8432e9ea84 (patch)
treedfee2b4c63f7b6623e9d6e025cab8f3fea35cb09 /clang/lib/CodeGen
parentbd0ec69e0a31ddcdde147c4e7dd1c323d5beea78 (diff)
downloadbcm5719-llvm-5ee4b9a11fb70efbbccb9e717012cb8432e9ea84.tar.gz
bcm5719-llvm-5ee4b9a11fb70efbbccb9e717012cb8432e9ea84.zip
Don't use unreachable as a placeholder, it confuses EmitBlock
This fixes an issue raised in D12412, where we generated invalid IR. Thanks to Vedant Kumar for coming up with the initial work around. Differential Revision: http://reviews.llvm.org/D12412 llvm-svn: 246880
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGExprAgg.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index 883b76bcfab..3182ac5509f 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -1253,7 +1253,9 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) {
assert(LV.isSimple());
if (CGF.needsEHCleanup(dtorKind)) {
if (!cleanupDominator)
- cleanupDominator = CGF.Builder.CreateUnreachable(); // placeholder
+ cleanupDominator = CGF.Builder.CreateLoad(
+ CGF.Int8Ty,
+ llvm::Constant::getNullValue(CGF.Int8PtrTy)); // placeholder
CGF.pushDestroy(EHCleanup, LV.getAddress(), field->getType(),
CGF.getDestroyer(dtorKind), false);
OpenPOWER on IntegriCloud