Revert the attempt to optimize the constexpr functions. MSVC does not…

… handle this yet git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@291515 91177308-0d34-0410-b5e6-96231b3b80d8
zmyer · Jan 10, 2017 · e444a76 · e444a76
1 parent 178be5d
commit e444a76
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/include/llvm/Support/AlignOf.h b/include/llvm/Support/AlignOf.h
@@ -110,15 +110,14 @@ namespace detail {
 template <typename T1> constexpr size_t aligner() { return alignof(T1); }
 
 template <typename T1, typename T2, typename... Ts> constexpr size_t aligner() {
-  size_t rest = aligner<T2, Ts...>();
-  return (alignof(T1) > rest) ? alignof(T1) : rest;
+  return (alignof(T1) > aligner<T2, Ts...>()) ? alignof(T1)
+                                              : aligner<T2, Ts...>();
 }
 
 template <typename T1> constexpr size_t sizer() { return sizeof(T1); }
 
 template <typename T1, typename T2, typename... Ts> constexpr size_t sizer() {
-  size_t rest = sizer<T2, Ts...>();
-  return (sizeof(T1) > rest) ? sizeof(T1) : rest;
+  return (sizeof(T1) > sizer<T2, Ts...>()) ? sizeof(T1) : sizer<T2, Ts...>();
 }
 } // end namespace detail