1 files changed, 13 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp
index b9671c2c17..55be2c2c8f 100644
--- a/lib/Sema/SemaTemplateInstantiateExpr.cpp
+++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp
@@ -83,7 +83,7 @@ namespace {
     OwningExprResult VisitCXXBoolLiteralExpr(CXXBoolLiteralExpr *E);
     OwningExprResult VisitCXXNullPtrLiteralExpr(CXXNullPtrLiteralExpr *E);
     // FIXME: CXXTypeIdExpr
-    // FIXME: CXXThrowExpr
+    OwningExprResult VisitCXXThrowExpr(CXXThrowExpr *E);
     // FIXME: CXXDefaultArgExpr
     OwningExprResult VisitCXXConstructExpr(CXXConstructExpr *E);
     OwningExprResult VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr *E);
@@ -813,6 +813,18 @@ TemplateExprInstantiator::VisitCXXThisExpr(CXXThisExpr *E) {
 }
 
 Sema::OwningExprResult 
+TemplateExprInstantiator::VisitCXXThrowExpr(CXXThrowExpr *E) {
+  OwningExprResult SubExpr(SemaRef, (void *)0);
+  if (E->getSubExpr()) {
+    SubExpr = Visit(E->getSubExpr());
+    if (SubExpr.isInvalid())
+      return SemaRef.ExprError();
+  }
+
+  return SemaRef.ActOnCXXThrow(E->getThrowLoc(), move(SubExpr));
+}
+
+Sema::OwningExprResult 
 TemplateExprInstantiator::VisitCXXConstructExpr(CXXConstructExpr *E) {
   assert(!cast<CXXRecordDecl>(E->getConstructor()->getDeclContext())
            ->isDependentType() && "Dependent constructor shouldn't be here");