From: James Y Knight <jyknight@google.com>
Date: Fri, 17 Jul 2015 21:58:11 +0000 (+0000)
Subject: Hopefully fix android i386 build after r242554.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87a1c47cfd870a22a67068d03007a260458392ea;p=clang

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 7b541b53ea..dc7a6c6085 100644
--- 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.