maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add a new variant of Evaluate and reimplement the old Evaluate in terms of the new. 

llvm-svn: 60298
This commit is contained in:
Anders Carlsson 2008-11-30 16:58:53 +00:00
parent f50de0c590
commit 7b6f0af83f
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/AST/Expr.h
View File

@ -166,6 +166,8 @@ public:
/// any crazy technique (that has nothing to do with language standards) that
/// we want to. If this function returns true, it returns the folded constant
/// in Result.
bool Evaluate(EvalResult &Result, ASTContext &Ctx) const;
// FIXME: We should come up with a better API for the isEvaluated case.
bool Evaluate(APValue& Result, ASTContext &Ctx, bool *isEvaluated = 0) const;

24
clang/lib/AST/ExprConstant.cpp
View File

@ -1160,33 +1160,43 @@ APValue ComplexFloatExprEvaluator::VisitBinaryOperator(const BinaryOperator *E)
/// any crazy technique (that has nothing to do with language standards) that
/// we want to. If this function returns true, it returns the folded constant
/// in Result.
bool Expr::Evaluate(APValue &Result, ASTContext &Ctx, bool *isEvaluated) const {
Expr::EvalResult EvalResult;
EvalInfo Info(Ctx, EvalResult);
bool Expr::Evaluate(EvalResult &Result, ASTContext &Ctx) const {
EvalInfo Info(Ctx, Result);
if (getType()->isIntegerType()) {
llvm::APSInt sInt(32);
if (!EvaluateInteger(this, sInt, Info))
return false;
Result = APValue(sInt);
Result.Val = APValue(sInt);
} else if (getType()->isPointerType()) {
if (!EvaluatePointer(this, Result, Info))
if (!EvaluatePointer(this, Result.Val, Info))
return false;
} else if (getType()->isRealFloatingType()) {
llvm::APFloat f(0.0);
if (!EvaluateFloat(this, f, Info))
return false;
Result = APValue(f);
Result.Val = APValue(f);
} else if (getType()->isComplexType()) {
if (!EvaluateComplexFloat(this, Result, Info))
if (!EvaluateComplexFloat(this, Result.Val, Info))
return false;
} else
return false;
return true;
}
bool Expr::Evaluate(APValue &Result, ASTContext &Ctx, bool *isEvaluated) const {
EvalResult EvalResult;
if (!Evaluate(EvalResult, Ctx))
return false;
Result = EvalResult.Val;
if (isEvaluated)
*isEvaluated = !EvalResult.HasSideEffects;
return true;
}