diff options
| author | James Y Knight <jyknight@google.com> | 2015-07-17 21:58:11 +0000 |
|---|---|---|
| committer | James Y Knight <jyknight@google.com> | 2015-07-17 21:58:11 +0000 |
| commit | 8041e59370351cad70f5f647d55d806af05edef2 (patch) | |
| tree | 659ee852bb33c378b821b4a9f1eb144a8cb71acc /clang/lib | |
| parent | 3b3380ec4452fe04c29832846e34478ecb7d6a65 (diff) | |
| download | bcm5719-llvm-8041e59370351cad70f5f647d55d806af05edef2.tar.gz bcm5719-llvm-8041e59370351cad70f5f647d55d806af05edef2.zip | |
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.
llvm-svn: 242578
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/EHScopeStack.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/EHScopeStack.h b/clang/lib/CodeGen/EHScopeStack.h index 7b541b53ea6..dc7a6c60856 100644 --- a/clang/lib/CodeGen/EHScopeStack.h +++ b/clang/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. |
