]> granicus.if.org Git - clang/commitdiff
Don't use unreachable as a placeholder, it confuses EmitBlock
authorReid Kleckner <rnk@google.com>
Fri, 4 Sep 2015 21:39:15 +0000 (21:39 +0000)
committerReid Kleckner <rnk@google.com>
Fri, 4 Sep 2015 21:39:15 +0000 (21:39 +0000)
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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@246880 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExprAgg.cpp
test/CodeGenCXX/partial-init.cpp [new file with mode: 0644]

index 883b76bcfab06ee0a13404280c0df43e4347d0cb..3182ac5509fe68ea848857f38bf2e68d0a2ae6dd 100644 (file)
@@ -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/test/CodeGenCXX/partial-init.cpp b/test/CodeGenCXX/partial-init.cpp
new file mode 100644 (file)
index 0000000..c13b951
--- /dev/null
@@ -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