Overload IntExprEvaluator::Success() with a function that takes a CharUnits

parameter to tidy up the places where the expression is a size.

llvm-svn: 127454
This commit is contained in:
Ken Dyck 2011-03-11 02:13:43 +00:00
parent 05a23b1e61
commit dbc0191181
1 changed files with 10 additions and 5 deletions

View File

@ -953,6 +953,11 @@ public:
return true;
}
bool Success(CharUnits Size, const Expr *E) {
return Success(Size.getQuantity(), E);
}
bool Error(SourceLocation L, diag::kind D, const Expr *E) {
// Take the first error.
if (Info.EvalResult.Diag == 0) {
@ -1213,7 +1218,7 @@ bool IntExprEvaluator::TryEvaluateBuiltinObjectSize(CallExpr *E) {
Size -= Offset;
else
Size = CharUnits::Zero();
return Success(Size.getQuantity(), E);
return Success(Size, E);
}
bool IntExprEvaluator::VisitCallExpr(CallExpr *E) {
@ -1602,9 +1607,9 @@ bool IntExprEvaluator::VisitSizeOfAlignOfExpr(const SizeOfAlignOfExpr *E) {
// Handle alignof separately.
if (!E->isSizeOf()) {
if (E->isArgumentType())
return Success(GetAlignOfType(E->getArgumentType()).getQuantity(), E);
return Success(GetAlignOfType(E->getArgumentType()), E);
else
return Success(GetAlignOfExpr(E->getArgumentExpr()).getQuantity(), E);
return Success(GetAlignOfExpr(E->getArgumentExpr()), E);
}
QualType SrcTy = E->getTypeOfArgument();
@ -1625,7 +1630,7 @@ bool IntExprEvaluator::VisitSizeOfAlignOfExpr(const SizeOfAlignOfExpr *E) {
return false;
// Get information about the size.
return Success(Info.Ctx.getTypeSizeInChars(SrcTy).getQuantity(), E);
return Success(Info.Ctx.getTypeSizeInChars(SrcTy), E);
}
bool IntExprEvaluator::VisitOffsetOfExpr(const OffsetOfExpr *E) {
@ -1694,7 +1699,7 @@ bool IntExprEvaluator::VisitOffsetOfExpr(const OffsetOfExpr *E) {
}
}
}
return Success(Result.getQuantity(), E);
return Success(Result, E);
}
bool IntExprEvaluator::VisitUnaryOperator(const UnaryOperator *E) {