No need to null check the expr, Sema::SemaRef.InstantiateExpr handles all that.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71885 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaTemplateInstantiateStmt.cpp b/lib/Sema/SemaTemplateInstantiateStmt.cpp
index 957402a..8bdb42b 100644
--- a/lib/Sema/SemaTemplateInstantiateStmt.cpp
+++ b/lib/Sema/SemaTemplateInstantiateStmt.cpp
@@ -98,13 +98,10 @@
Sema::OwningStmtResult
TemplateStmtInstantiator::VisitReturnStmt(ReturnStmt *S) {
- Sema::OwningExprResult Result = SemaRef.ExprEmpty();
- if (Expr *E = S->getRetValue()) {
- Result = SemaRef.InstantiateExpr(E, TemplateArgs);
-
- if (Result.isInvalid())
- return SemaRef.StmtError();
- }
+ Sema::OwningExprResult Result =
+ SemaRef.InstantiateExpr(S->getRetValue(), TemplateArgs);
+ if (Result.isInvalid())
+ return SemaRef.StmtError();
return SemaRef.ActOnReturnStmt(S->getReturnLoc(), move(Result));
}