Merge commit '096c20c0b128' from llvm.org/main into next

Author: git apple-llvm automerger

clang/lib/Sema/TypeLocBuilder.h

@@ -20,7 +20,7 @@
 namespace clang {
 
 class TypeLocBuilder {
-  enum { InlineCapacity = 8 * sizeof(SourceLocation) };
+  static constexpr int InlineCapacity = 8 * sizeof(SourceLocation);
 
   /// The underlying location-data buffer.  Data grows from the end
   /// of the buffer backwards.
@@ -38,7 +38,7 @@ class TypeLocBuilder {
 #endif
 
   /// The inline buffer.
-  enum { BufferMaxAlignment = alignof(void *) };
+  static constexpr int BufferMaxAlignment = alignof(void *);
   alignas(BufferMaxAlignment) char InlineBuffer[InlineCapacity];
   unsigned NumBytesAtAlign4;
   bool AtAlign8;