[PATCH] D12412: [CodeGen] Point empty %invoke.cont block to successor

[Reid Kleckner via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL246880: Don't use unreachable as a placeholder, it confuses EmitBlock (authored by rnk).

Changed prior to commit:
  http://reviews.llvm.org/D12412?vs=33347&id=34080#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D12412

Files:
  cfe/trunk/lib/CodeGen/CGExprAgg.cpp
  cfe/trunk/test/CodeGenCXX/partial-init.cpp

Index: cfe/trunk/test/CodeGenCXX/partial-init.cpp
===================================================================
--- cfe/trunk/test/CodeGenCXX/partial-init.cpp
+++ cfe/trunk/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
Index: cfe/trunk/lib/CodeGen/CGExprAgg.cpp
===================================================================
--- cfe/trunk/lib/CodeGen/CGExprAgg.cpp
+++ cfe/trunk/lib/CodeGen/CGExprAgg.cpp
@@ -1253,7 +1253,9 @@
       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);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12412.34080.patch
Type: text/x-patch
Size: 1440 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150904/34a17e2b/attachment-0001.bin>