Author: dblaikie
Date: Fri May 3 11:11:31 2019
New Revision: 359913
URL: http://llvm.org/viewvc/llvm-project?rev=359913&view=rev
Log:
Remove else-after-return
Modified:
cfe/trunk/lib/AST/ExprConstant.cpp
Modified: cfe/trunk/lib/AST/ExprConstant.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExprConstant.cpp?rev=359913&r1=359912&r2=359913&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ExprConstant.cpp (original)
+++ cfe/trunk/lib/AST/ExprConstant.cpp Fri May 3 11:11:31 2019
@@ -8269,17 +8269,16 @@ bool IntExprEvaluator::VisitBuiltinCallE
case Builtin::BI__builtin_constant_p: {
const Expr *Arg = E->getArg(0);
- if (EvaluateBuiltinConstantP(Info, Arg)) {
+ if (EvaluateBuiltinConstantP(Info, Arg))
return Success(true, E);
- } else if (Info.InConstantContext || Arg->HasSideEffects(Info.Ctx)) {
+ if (Info.InConstantContext || Arg->HasSideEffects(Info.Ctx)) {
// Outside a constant context, eagerly evaluate to false in the presence
// of side-effects in order to avoid -Wunsequenced false-positives in
// a branch on __builtin_constant_p(expr).
return Success(false, E);
- } else {
- Info.FFDiag(E, diag::note_invalid_subexpr_in_const_expr);
- return false;
}
+ Info.FFDiag(E, diag::note_invalid_subexpr_in_const_expr);
+ return false;
}
case Builtin::BI__builtin_is_constant_evaluated:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
