From: Matt Beaumont-Gay <matthewbg@google.com>
Date: Mon, 7 May 2012 18:12:42 +0000 (+0000)
Subject: Don't assume size_t is unsigned long long.
X-Git-Tag: android-x86-6.0-r1~201^2~1599
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d58518a8b60962988c0b27803fc8e89916a5d80f;p=android-x86%2Fexternal-llvm.git

Don't assume size_t is unsigned long long.

Fixes a -Woverflow warning from gcc when building for 32-bit platforms.

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

diff --git a/lib/Support/SourceMgr.cpp b/lib/Support/SourceMgr.cpp
index 5fa987bc3df..37a9d8f8274 100644
--- a/lib/Support/SourceMgr.cpp
+++ b/lib/Support/SourceMgr.cpp
@@ -121,7 +121,7 @@ SourceMgr::getLineAndColumn(SMLoc Loc, int BufferID) const {
   Cache.LineNoOfQuery = LineNo;
   
   size_t NewlineOffs = StringRef(BufStart, Ptr-BufStart).find_last_of("\n\r");
-  if (NewlineOffs == StringRef::npos) NewlineOffs = ~0ULL;
+  if (NewlineOffs == StringRef::npos) NewlineOffs = ~(size_t)0;
   return std::make_pair(LineNo, Ptr-BufStart-NewlineOffs);
 }
 
@@ -358,5 +358,3 @@ void SMDiagnostic::print(const char *ProgName, raw_ostream &S,
   
   S << '\n';
 }
-
-