diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 8eeb09e..6160122 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -1330,13 +1330,15 @@ Sema::BuildCXXNew(SourceLocation StartLoc, bool UseGlobal,
   // C++0x [expr.new]p17:
   //   If the new expression creates an array of objects of class type,
   //   access and ambiguity control are done for the destructor.
-  if (ArraySize && AllocType->isRecordType() && !AllocType->isDependentType()) {
+  QualType BaseAllocType = Context.getBaseElementType(AllocType);
+  if (ArraySize && BaseAllocType->isRecordType() &&
+      !BaseAllocType->isDependentType()) {
     if (CXXDestructorDecl *dtor = LookupDestructor(
-            cast<CXXRecordDecl>(AllocType->getAs<RecordType>()->getDecl()))) {
+            cast<CXXRecordDecl>(BaseAllocType->getAs<RecordType>()->getDecl()))) {
       MarkFunctionReferenced(StartLoc, dtor);
       CheckDestructorAccess(StartLoc, dtor, 
                             PDiag(diag::err_access_dtor)
-                              << Context.getBaseElementType(AllocType));
+                              << BaseAllocType);
       DiagnoseUseOfDecl(dtor, StartLoc);
     }
   }
diff --git a/test/CXX/expr/expr.unary/expr.new/p17-crash.cpp b/test/CXX/expr/expr.unary/expr.new/p17-crash.cpp
new file mode 100644
index 0000000..27b915e
--- /dev/null
+++ b/test/CXX/expr/expr.unary/expr.new/p17-crash.cpp
@@ -0,0 +1,14 @@
+// RUN: %clang_cc1 -emit-llvm-only %s
+
+// this used to crash due to templ<int>'s dtor not being marked as used by the
+// new expression in func()
+struct non_trivial {
+  non_trivial() {} 
+  ~non_trivial() {}
+};
+template < typename T > class templ {
+  non_trivial n;
+};
+void func() {
+  new templ<int>[1][1];
+}
diff --git a/test/CXX/expr/expr.unary/expr.new/p17.cpp b/test/CXX/expr/expr.unary/expr.new/p17.cpp
new file mode 100644
index 0000000..e24e16a
--- /dev/null
+++ b/test/CXX/expr/expr.unary/expr.new/p17.cpp
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+class foo {
+  ~foo(); // expected-note 2 {{implicitly declared private here}}
+};
+
+void test() {
+  new foo[3]; // expected-error{{calling a private destructor of class 'foo'}}
+  new foo[3][3]; // expected-error{{calling a private destructor of class 'foo'}}
+}