Hopefully fix android i386 build after r242554.

That platform has alignof(uint64_t) == 4, but, since LLVM_ALIGNAS(...)
cannot take anything but literal integers due to MSVC limitations, the
literal '8' used there didn't match. Switch ScopeStackAlignment to
just use 8, as well.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@242578 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/EHScopeStack.h b/lib/CodeGen/EHScopeStack.h
index 7b541b53ea69795e6f4d3b49b0cfd6a63cbf870b..dc7a6c60856262f006ffd09ef917d30d6b2c70b6 100644 (file)
--- a/lib/CodeGen/EHScopeStack.h
+++ b/lib/CodeGen/EHScopeStack.h
@@ -96,7 +96,8 @@ enum CleanupKind : unsigned {
 /// and catch blocks.
 class EHScopeStack {
 public:
-  enum { ScopeStackAlignment = llvm::AlignOf<uint64_t>::Alignment };
+  /* Should switch to alignof(uint64_t) instead of 8, when EHCleanupScope can */
+  enum { ScopeStackAlignment = 8 };
 
   /// A saved depth on the scope stack.  This is necessary because
   /// pushing scopes onto the stack invalidates iterators.