summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Ricci <riccibrun@gmail.com>2018-08-06 14:33:45 +0000
committerBruno Ricci <riccibrun@gmail.com>2018-08-06 14:33:45 +0000
commit8d53476614157bba06b14e672621cef7e7ee7497 (patch)
tree6ff1d068355c985a4076b064d51ba82d695751c4
parent58529c3f5739c7bdb74da8c6ce3e2d16672e9315 (diff)
downloadbcm5719-llvm-8d53476614157bba06b14e672621cef7e7ee7497.tar.gz
bcm5719-llvm-8d53476614157bba06b14e672621cef7e7ee7497.zip
[AST] Move the enum in ObjCMethodDeclBitfields
Move the enum { ObjCMethodFamilyBitWidth = 4 } to the top of the class. For some dark reason having the enum between the bitfields breaks the packing with gcc version 7.3-win32 20180312. Reported by: Abramo Bagnara (by email) llvm-svn: 339017
-rw-r--r--clang/include/clang/AST/DeclBase.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/include/clang/AST/DeclBase.h b/clang/include/clang/AST/DeclBase.h
index 3f7f756a342..85357111221 100644
--- a/clang/include/clang/AST/DeclBase.h
+++ b/clang/include/clang/AST/DeclBase.h
@@ -1554,8 +1554,6 @@ class DeclContext {
/// methods in ObjCMethodDecl should be updated appropriately.
class ObjCMethodDeclBitfields {
friend class ObjCMethodDecl;
- /// For the bits in DeclContextBitfields.
- uint64_t : NumDeclContextBits;
/// This is needed for the bitwidth of Family below but
/// is defined in Basic/IdentifierTable.h which we do not include.
@@ -1564,6 +1562,9 @@ class DeclContext {
/// that these two ObjCMethodFamilyBitWidth are equal.
enum { ObjCMethodFamilyBitWidth = 4 };
+ /// For the bits in DeclContextBitfields.
+ uint64_t : NumDeclContextBits;
+
/// The conventional meaning of this method; an ObjCMethodFamily.
/// This is not serialized; instead, it is computed on demand and
/// cached.
OpenPOWER on IntegriCloud