diff options
| -rw-r--r-- | clang/lib/CodeGen/CGExprAgg.cpp | 4 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/partial-init.cpp | 27 |
2 files changed, 30 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); diff --git a/clang/test/CodeGenCXX/partial-init.cpp b/clang/test/CodeGenCXX/partial-init.cpp new file mode 100644 index 00000000000..c13b951fdb7 --- /dev/null +++ b/clang/test/CodeGenCXX/partial-init.cpp @@ -0,0 +1,27 @@ +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -std=c++11 -fcxx-exceptions -fexceptions -S -emit-llvm -o - %s | FileCheck %s + +namespace std { + struct string { + const char *p; + string(const char *s); + ~string(); + }; +} + +struct Bar { + int a; +}; + +struct Foo { + std::string c; + Bar d[32]; +}; + +static Foo table[] = { + { "blerg" }, +}; + +// CHECK: define internal void @__cxx_global_var_init +// CHECK: invoke void @_ZNSt6stringC1EPKc( +// CHECK-NOT: unreachable +// CHECK: br label |
