diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h
index 4a3dcc1170ec50f6dfa84931b03af278d74e1ef6..aa0861808a20336b5b3b09fc0211a54150e3b410 100644
--- a/include/clang/AST/Type.h
+++ b/include/clang/AST/Type.h
@@ -233,6 +233,8 @@ public:
   static inline clang::QualType getFromVoidPointer(void *P) {
     return clang::QualType::getFromOpaquePtr(P);
   }
+  // CVR qualifiers go in low bits.
+  static inline unsigned getNumLowBitsAvailable() { return 0; }
 };
 } // end namespace llvm
 
diff --git a/include/clang/Parse/Ownership.h b/include/clang/Parse/Ownership.h
index 904676d8735df62678f37bbc0cbff6bfc4c7eb1d..362220fc6d6def3cb98cbd778b21779f93f1c33d 100644
--- a/include/clang/Parse/Ownership.h
+++ b/include/clang/Parse/Ownership.h
@@ -57,6 +57,7 @@ namespace llvm {
     static inline clang::OpaquePtr<UID> getFromVoidPointer(void *P) {
       return clang::OpaquePtr<UID>::make(P);
     }
+    static inline unsigned getNumLowBitsAvailable() { return 3; }
   };
 }