diff options
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiate.cpp | 11 |
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 |