From f0c4f356b866c3d84b99a3abd692b30dcaf51b5f Mon Sep 17 00:00:00 2001 From: John McCall Date: Fri, 7 May 2010 05:46:35 +0000 Subject: [PATCH] Change Evaluate* in the constant evaluator to enforce being given an argument of the right type. It turns out that the code was already doing this. llvm-svn: 103238 --- clang/lib/AST/ExprConstant.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index f6e0c29d8dcd..30ef6f3aec8d 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -395,8 +395,7 @@ public: } // end anonymous namespace static bool EvaluatePointer(const Expr* E, APValue& Result, EvalInfo &Info) { - if (!E->getType()->hasPointerRepresentation()) - return false; + assert(E->getType()->hasPointerRepresentation()); Result = PointerExprEvaluator(Info).Visit(const_cast(E)); return Result.isLValue(); } @@ -872,13 +871,13 @@ private: } // end anonymous namespace static bool EvaluateIntegerOrLValue(const Expr* E, APValue &Result, EvalInfo &Info) { - if (!E->getType()->isIntegralType()) - return false; - + assert(E->getType()->isIntegralType()); return IntExprEvaluator(Info, Result).Visit(const_cast(E)); } static bool EvaluateInteger(const Expr* E, APSInt &Result, EvalInfo &Info) { + assert(E->getType()->isIntegralType()); + APValue Val; if (!EvaluateIntegerOrLValue(E, Val, Info) || !Val.isInt()) return false; @@ -1656,6 +1655,7 @@ public: } // end anonymous namespace static bool EvaluateFloat(const Expr* E, APFloat& Result, EvalInfo &Info) { + assert(E->getType()->isRealFloatingType()); return FloatExprEvaluator(Info, Result).Visit(const_cast(E)); } @@ -1977,6 +1977,7 @@ public: } // end anonymous namespace static bool EvaluateComplex(const Expr *E, APValue &Result, EvalInfo &Info) { + assert(E->getType()->isAnyComplexType()); Result = ComplexExprEvaluator(Info).Visit(const_cast(E)); assert((!Result.isComplexFloat() || (&Result.getComplexFloatReal().getSemantics() ==