Author: jyknight
Date: Fri Jul 17 16:58:11 2015
New Revision: 242578
URL: http://llvm.org/viewvc/llvm-project?rev=242578&view=rev
Log:
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.
Modified:
cfe/trunk/lib/CodeGen/EHScopeStack.h
Modified: cfe/trunk/lib/CodeGen/EHScopeStack.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/EHScopeStack.h?rev=242578&r1=242577&r2=242578&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/EHScopeStack.h (original)
+++ cfe/trunk/lib/CodeGen/EHScopeStack.h Fri Jul 17 16:58:11 2015
@@ -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.
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
