[cfe-commits] r85140 - /cfe/trunk/lib/AST/ExprConstant.cpp

[Mike Stump]

Author: mrs
Date: Mon Oct 26 13:57:47 2009
New Revision: 85140

URL: http://llvm.org/viewvc/llvm-project?rev=85140&view=rev
Log:
Be sure to zero-extend.  And refactor.

Modified:
    cfe/trunk/lib/AST/ExprConstant.cpp

Modified: cfe/trunk/lib/AST/ExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExprConstant.cpp?rev=85140&r1=85139&r2=85140&view=diff

==============================================================================
--- cfe/trunk/lib/AST/ExprConstant.cpp (original)
+++ cfe/trunk/lib/AST/ExprConstant.cpp Mon Oct 26 13:57:47 2009
@@ -875,11 +875,6 @@
     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 @@
         }
 
     if (Base.HasSideEffects) {
-      if (Result.getSExtValue() < 2)
+      if (E->getArg(1)->EvaluateAsInt(Info.Ctx).getZExtValue() < 2)
         return Success(-1, E);
       return Success(0, E);
     }