simplify logic, isInvalid check is redundant

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67216 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 8 deletions

diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index 59b795d0f5..cfe5daacdc 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -839,14 +839,9 @@ TemplateExprInstantiator::VisitConditionalOperator(ConditionalOperator *E) {
   if (False.isInvalid())
     return SemaRef.ExprError();
 
-  Sema::OwningExprResult Result
-    = SemaRef.ActOnConditionalOp(E->getCond()->getLocEnd(),
-                                 E->getFalseExpr()->getLocStart(),
-                                 move(Cond), move(True), move(False));
-  if (Result.isInvalid())
-    return SemaRef.ExprError();
-
-  return move(Result);
+  return SemaRef.ActOnConditionalOp(E->getCond()->getLocEnd(),
+                                    E->getFalseExpr()->getLocStart(),
+                                    move(Cond), move(True), move(False));
 }
 
 Sema::OwningExprResult