forked from OSchip/llvm-project
Fix mingw build by moving the static const data member before the bitfields
Apparently GCC targeting Windows breaks bitfields on static data members: struct Foo { unsigned X : 16; static const int M = 42; unsigned Y : 16; }; static_assert(sizeof(Foo) == 4, "asdf"); // fails Who knew. llvm-svn: 290700
This commit is contained in:
parent
6658cc9ead
commit
32f171fec4
|
@ -85,6 +85,9 @@ protected:
|
|||
}
|
||||
|
||||
Type *ValueType;
|
||||
|
||||
static const unsigned GlobalValueSubClassDataBits = 18;
|
||||
|
||||
// All bitfields use unsigned as the underlying type so that MSVC will pack
|
||||
// them.
|
||||
unsigned Linkage : 4; // The linkage of this global
|
||||
|
@ -100,8 +103,6 @@ protected:
|
|||
/// Function::intrinsicID() returns Intrinsic::not_intrinsic.
|
||||
unsigned HasLLVMReservedName : 1;
|
||||
|
||||
static const unsigned GlobalValueSubClassDataBits = 18;
|
||||
|
||||
private:
|
||||
friend class Constant;
|
||||
|
||||
|
|
Loading…
Reference in New Issue