[cfe-commits] r67216 - /cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp

[Gabor Greif]

Author: ggreif
Date: Wed Mar 18 12:53:25 2009
New Revision: 67216

URL: http://llvm.org/viewvc/llvm-project?rev=67216&view=rev
Log:
simplify logic, isInvalid check is redundant

Modified:
    cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp?rev=67216&r1=67215&r2=67216&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp Wed Mar 18 12:53:25 2009
@@ -839,14 +839,9 @@
   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