Be sure to zero-extend. And refactor.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85140 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 9129558421421c7792f79311552e9eef7aa8bb6a..f1a446ef6e748d60d1cb879abbe0f3a3b1f10760 100644 (file)
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -875,11 +875,6 @@ bool IntExprEvaluator::VisitCallExpr(const CallExpr *E) {
     return Error(E->getLocStart(), diag::note_invalid_subexpr_in_ice, E);
 
   case Builtin::BI__builtin_object_size: {
-    llvm::APSInt Result(32);
-    
-    if (!E->getArg(1)->isIntegerConstantExpr(Result, Info.Ctx))
-      assert(0 && "arg2 not ice in __builtin_object_size");
-
     const Expr *Arg = E->getArg(0)->IgnoreParens();
     Expr::EvalResult Base;
     if (Arg->Evaluate(Base, Info.Ctx)
@@ -895,7 +890,7 @@ bool IntExprEvaluator::VisitCallExpr(const CallExpr *E) {
         }
 
     if (Base.HasSideEffects) {
-      if (Result.getSExtValue() < 2)
+      if (E->getArg(1)->EvaluateAsInt(Info.Ctx).getZExtValue() < 2)
         return Success(-1, E);
       return Success(0, E);
     }