2 files changed, 42 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 62df9820a6c..145a0e67543 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -606,6 +606,11 @@ static void EmitMemberInitializer(CodeGenFunction &CGF,
       // Copy the aggregate.
       CGF.EmitAggregateCopy(LHS.getAddress(), Src.getAddress(), FieldType,
                             LHS.isVolatileQualified());
+      // Ensure that we destroy the objects if an exception is thrown later in
+      // the constructor.
+      QualType::DestructionKind dtorKind = FieldType.isDestructedType();
+      if (CGF.needsEHCleanup(dtorKind))
+        CGF.pushEHDestroy(dtorKind, LHS.getAddress(), FieldType); 
       return;
     }
   }
diff --git a/clang/test/CodeGenCXX/eh-aggregate-copy-destroy.cpp b/clang/test/CodeGenCXX/eh-aggregate-copy-destroy.cpp
new file mode 100644
index 00000000000..29fb5567fb1
--- /dev/null
+++ b/clang/test/CodeGenCXX/eh-aggregate-copy-destroy.cpp
@@ -0,0 +1,37 @@
+// Check that in case of copying an array of memcpy-able objects, their
+// destructors will be called if an exception is thrown.
+//
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fexceptions -fcxx-exceptions -O0 -fno-elide-constructors -emit-llvm %s -o - | FileCheck %s
+
+struct ImplicitCopy {
+  int x;
+  ImplicitCopy() { x = 10; }
+  ~ImplicitCopy() { x = 20; }
+};
+
+struct ThrowCopy {
+  ThrowCopy() {}
+  ThrowCopy(const ThrowCopy &) { throw 1; }
+};
+
+struct Container {
+  ImplicitCopy b[2];
+  ThrowCopy c;
+};
+
+int main () {
+  try {
+    Container c1;
+    // CHECK_LABEL: main
+    // CHECK-NOT: call void @_ZN9ThrowCopyC1ERKS_
+    // CHECK: invoke void @_ZN9ThrowCopyC1ERKS_
+    // CHECK: invoke void @_ZN12ImplicitCopyD1Ev
+    Container c2(c1);
+  }
+  catch (...) {
+    return 1;
+  }
+
+  return 0;
+}
+