diff --git a/clang/include/clang/AST/ASTContext.h b/clang/include/clang/AST/ASTContext.h
index 425ee3cdb23112148e23ef5576f32063906d3a91..ab1e52d255c84bd43c93d68b9d91f7c979778e1b 100644
--- a/clang/include/clang/AST/ASTContext.h
+++ b/clang/include/clang/AST/ASTContext.h
@@ -34,6 +34,7 @@
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/TinyPtrVector.h"
 #include "llvm/Support/Allocator.h"
+#include "llvm/Support/Compiler.h"
 #include <vector>
 
 namespace llvm {
@@ -1225,7 +1226,8 @@ public:
 
 private:
   CanQualType getFromTargetType(unsigned Type) const;
-  std::pair<uint64_t, unsigned> getTypeInfoImpl(const Type *T) const;
+  std::pair<uint64_t, unsigned>
+  getTypeInfoImpl(const Type *T) const LLVM_READONLY;
 
   //===--------------------------------------------------------------------===//
   //                         Type Predicates.
@@ -1259,8 +1261,8 @@ public:
 
   /// getTypeInfo - Get the size and alignment of the specified complete type in
   /// bits.
-  std::pair<uint64_t, unsigned> getTypeInfo(const Type *T) const;
-  std::pair<uint64_t, unsigned> getTypeInfo(QualType T) const {
+  std::pair<uint64_t, unsigned> getTypeInfo(const Type *T) const LLVM_READONLY;
+  std::pair<uint64_t, unsigned> getTypeInfo(QualType T) const LLVM_READONLY {
     return getTypeInfo(T.getTypePtr());
   }
 
@@ -1661,7 +1663,7 @@ public:
 
   // The width of an integer, as defined in C99 6.2.6.2. This is the number
   // of bits in an integer type excluding any padding bits.
-  unsigned getIntWidth(QualType T) const;
+  unsigned getIntWidth(QualType T) const LLVM_READONLY;
 
   // Per C99 6.2.5p6, for every signed integer type, there is a corresponding
   // unsigned integer type.  This method takes a signed type, and returns the