I take it back, InstantiateExpr does not check for null.

llvm-svn: 71887

1 files changed, 7 insertions, 4 deletions

diff --git a/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp b/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp
index 8bdb42b58f6..957402ac6f6 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp
@@ -98,10 +98,13 @@ Sema::OwningStmtResult TemplateStmtInstantiator::VisitGotoStmt(GotoStmt *S) {
 
 Sema::OwningStmtResult
 TemplateStmtInstantiator::VisitReturnStmt(ReturnStmt *S) {
-  Sema::OwningExprResult Result = 
-        SemaRef.InstantiateExpr(S->getRetValue(), TemplateArgs);
-  if (Result.isInvalid())
-    return SemaRef.StmtError();
+  Sema::OwningExprResult Result = SemaRef.ExprEmpty();
+  if (Expr *E = S->getRetValue()) {
+    Result = SemaRef.InstantiateExpr(E, TemplateArgs);
+    
+    if (Result.isInvalid())
+      return SemaRef.StmtError();
+  }
   
   return SemaRef.ActOnReturnStmt(S->getReturnLoc(), move(Result));
 }