rename Expr::tryEvaluate to Expr::Evaluate.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59426 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index 98e70e8..a8eb8f7 100644
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -39,7 +39,7 @@
RValue CodeGenFunction::EmitBuiltinExpr(unsigned BuiltinID, const CallExpr *E) {
// See if we can constant fold this builtin. If so, don't emit it at all.
APValue Result;
- if (E->tryEvaluate(Result, CGM.getContext())) {
+ if (E->Evaluate(Result, CGM.getContext())) {
if (Result.isInt())
return RValue::get(llvm::ConstantInt::get(Result.getInt()));
assert(Result.isFloat() && "Unsupported constant type");
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 7b33fdb..41379b5 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -610,7 +610,7 @@
llvm::Constant *VisitCallExpr(const CallExpr *E) {
APValue Result;
- if (E->tryEvaluate(Result, CGM.getContext())) {
+ if (E->Evaluate(Result, CGM.getContext())) {
if (Result.isInt())
return llvm::ConstantInt::get(Result.getInt());
if (Result.isFloat())
@@ -845,7 +845,7 @@
#ifdef USE_TRY_EVALUATE
APValue V;
- if (E->tryEvaluate(V, Context)) {
+ if (E->Evaluate(V, Context)) {
// FIXME: Assert that the value doesn't have any side effects.
switch (V.getKind()) {
default: assert(0 && "unhandled value kind!");
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index e6deaa7..ff05f6e 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -197,7 +197,7 @@
// FIXME: Rename and handle conversion of other evaluatable things
// to bool.
- if (!Cond->tryEvaluate(V, getContext()) || !V.isInt())
+ if (!Cond->Evaluate(V, getContext()) || !V.isInt())
return 0; // Not foldable or not integer.
if (CodeGenFunction::ContainsLabel(Cond))