2 files changed, 26 insertions, 2 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp
index 340cabd085..b9671c2c17 100644
--- a/lib/Sema/SemaTemplateInstantiateExpr.cpp
+++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp
@@ -89,7 +89,7 @@ namespace {
     OwningExprResult VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr *E);
     OwningExprResult VisitCXXZeroInitValueExpr(CXXZeroInitValueExpr *E);
     OwningExprResult VisitCXXNewExpr(CXXNewExpr *E);
-    // FIXME: CXXDeleteExpr
+    OwningExprResult VisitCXXDeleteExpr(CXXDeleteExpr *E);
     // FIXME: UnaryTypeTraitExpr
     // FIXME: QualifiedDeclRefExpr
     OwningExprResult VisitCXXExprWithTemporaries(CXXExprWithTemporaries *E);
@@ -936,6 +936,18 @@ TemplateExprInstantiator::VisitCXXNewExpr(CXXNewExpr *E) {
 }
 
 Sema::OwningExprResult 
+TemplateExprInstantiator::VisitCXXDeleteExpr(CXXDeleteExpr *E) {
+  OwningExprResult Operand = Visit(E->getArgument());
+  if (Operand.isInvalid())
+    return SemaRef.ExprError();
+
+  return SemaRef.ActOnCXXDelete(E->getSourceRange().getBegin(),
+                                E->isGlobalDelete(),
+                                E->isArrayForm(),
+                                move(Operand));
+}
+
+Sema::OwningExprResult 
 TemplateExprInstantiator::VisitCXXExprWithTemporaries(
                                                   CXXExprWithTemporaries *E) {
   OwningExprResult SubExpr = Visit(E->getSubExpr());
diff --git a/test/SemaTemplate/instantiate-expr-4.cpp b/test/SemaTemplate/instantiate-expr-4.cpp
index a6bafc5b2e..2fd9f04569 100644
--- a/test/SemaTemplate/instantiate-expr-4.cpp
+++ b/test/SemaTemplate/instantiate-expr-4.cpp
@@ -44,7 +44,7 @@ struct Temporaries0 {
 template struct Temporaries0<5, 7>;
 
 // ---------------------------------------------------------------------
-// new expressions
+// new/delete expressions
 // ---------------------------------------------------------------------
 struct Y { };
 
@@ -83,3 +83,15 @@ struct New2 {
 template struct New2<X, int, float>;
 template struct New2<X, int, int*>; // expected-note{{instantiation}}
 // FIXME: template struct New2<int, int, float>;
+
+template<typename T>
+struct Delete0 {
+  void f(T t) {
+    delete t; // expected-error{{cannot delete}}
+    ::delete [] t;
+  }
+};
+
+template struct Delete0<int*>;
+template struct Delete0<X*>;
+template struct Delete0<int>; // expected-note{{instantiation}}