Fix for PR5679: make __builtin_prefetch a bit more flexible in what it accepts

as a constant integer.  Also, some minor cleanup and improvements to the
diagnostics.

llvm-svn: 90504

1 files changed, 9 insertions, 9 deletions

diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 9060fe6ab74..28de5005f8a 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -700,30 +700,30 @@ bool Sema::SemaBuiltinPrefetch(CallExpr *TheCall) {
     if (Arg->isTypeDependent())
       continue;
 
-    QualType RWType = Arg->getType();
-
-    const BuiltinType *BT = RWType->getAs<BuiltinType>();
-    llvm::APSInt Result;
-    if (!BT || BT->getKind() != BuiltinType::Int)
-      return Diag(TheCall->getLocStart(), diag::err_prefetch_invalid_argument)
+    if (!Arg->getType()->isIntegralType())
+      return Diag(TheCall->getLocStart(), diag::err_prefetch_invalid_arg_type)
               << Arg->getSourceRange();
 
+    ImpCastExprToType(Arg, Context.IntTy, CastExpr::CK_IntegralCast);
+    TheCall->setArg(i, Arg);
+
     if (Arg->isValueDependent())
       continue;
 
+    llvm::APSInt Result;
     if (!Arg->isIntegerConstantExpr(Result, Context))
-      return Diag(TheCall->getLocStart(), diag::err_prefetch_invalid_argument)
+      return Diag(TheCall->getLocStart(), diag::err_prefetch_invalid_arg_ice)
         << SourceRange(Arg->getLocStart(), Arg->getLocEnd());
 
     // FIXME: gcc issues a warning and rewrites these to 0. These
     // seems especially odd for the third argument since the default
     // is 3.
     if (i == 1) {
-      if (Result.getSExtValue() < 0 || Result.getSExtValue() > 1)
+      if (Result.getLimitedValue() > 1)
         return Diag(TheCall->getLocStart(), diag::err_argument_invalid_range)
              << "0" << "1" << Arg->getSourceRange();
     } else {
-      if (Result.getSExtValue() < 0 || Result.getSExtValue() > 3)
+      if (Result.getLimitedValue() > 3)
         return Diag(TheCall->getLocStart(), diag::err_argument_invalid_range)
             << "0" << "3" << Arg->getSourceRange();
     }