Index: include/clang/Basic/SourceManager.h
===================================================================
--- include/clang/Basic/SourceManager.h	(revision 167723)
+++ include/clang/Basic/SourceManager.h	(working copy)
@@ -270,7 +270,7 @@
       return SourceLocation::getFromRawEncoding(IncludeLoc);
     }
     const ContentCache* getContentCache() const {
-      return reinterpret_cast<const ContentCache*>(Data & ~7UL);
+      return reinterpret_cast<const ContentCache*>(Data & ~7ULL);
     }
 
     /// \brief Return whether this is a system header or not.