Index: include/llvm/Support/AlignOf.h
===================================================================
--- include/llvm/Support/AlignOf.h
+++ include/llvm/Support/AlignOf.h
@@ -216,24 +216,28 @@
 #endif // _MSC_VER
 
 namespace detail {
-template <typename T1,
-          typename T2 = char, typename T3 = char, typename T4 = char,
-          typename T5 = char, typename T6 = char, typename T7 = char,
-          typename T8 = char, typename T9 = char, typename T10 = char>
-class AlignerImpl {
-  T1 t1; T2 t2; T3 t3; T4 t4; T5 t5; T6 t6; T7 t7; T8 t8; T9 t9; T10 t10;
-
-  AlignerImpl() = delete;
+template <typename T, typename... Ts> struct AlignerImpl {
+  enum {
+    X = AlignOf<T>::Alignment,
+    Y = AlignerImpl<Ts...>::Alignment,
+    Alignment = (X > Y) ? X : Y
+  };
 };
 
-template <typename T1,
-          typename T2 = char, typename T3 = char, typename T4 = char,
-          typename T5 = char, typename T6 = char, typename T7 = char,
-          typename T8 = char, typename T9 = char, typename T10 = char>
-union SizerImpl {
-  char arr1[sizeof(T1)], arr2[sizeof(T2)], arr3[sizeof(T3)], arr4[sizeof(T4)],
-       arr5[sizeof(T5)], arr6[sizeof(T6)], arr7[sizeof(T7)], arr8[sizeof(T8)],
-       arr9[sizeof(T9)], arr10[sizeof(T10)];
+template <typename T> struct AlignerImpl<T> {
+  enum { Alignment = AlignOf<T>::Alignment };
+};
+
+template <typename T, typename... Ts> struct SizerImpl {
+  enum {
+    X = sizeof(T),
+    Y = SizerImpl<Ts...>::SizeOf,
+    SizeOf = (X > Y) ? X : Y
+  };
+};
+
+template <typename T> struct SizerImpl<T> {
+  enum { SizeOf = sizeof(T) };
 };
 } // end namespace detail
 
@@ -242,18 +246,11 @@
 ///
 /// These types may be arrays, structs, or any other types. The goal is to
 /// expose a char array buffer member which can be used as suitable storage for
-/// a placement new of any of these types. Support for more than ten types can
-/// be added at the cost of more boilerplate.
-template <typename T1,
-          typename T2 = char, typename T3 = char, typename T4 = char,
-          typename T5 = char, typename T6 = char, typename T7 = char,
-          typename T8 = char, typename T9 = char, typename T10 = char>
-struct AlignedCharArrayUnion : llvm::AlignedCharArray<
-    AlignOf<llvm::detail::AlignerImpl<T1, T2, T3, T4, T5,
-                                      T6, T7, T8, T9, T10> >::Alignment,
-    sizeof(::llvm::detail::SizerImpl<T1, T2, T3, T4, T5,
-                                     T6, T7, T8, T9, T10>)> {
-};
+/// a placement new of any of these types.
+template <typename... Ts>
+using AlignedCharArrayUnion =
+    llvm::AlignedCharArray<llvm::detail::AlignerImpl<Ts...>::Alignment,
+                           llvm::detail::SizerImpl<Ts...>::SizeOf>;
 } // end namespace llvm
 
 #endif // LLVM_SUPPORT_ALIGNOF_H