maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

D5775: Fix of assertion failure in case of non-POD unions with bitfields. Patch by Evgeny Astigeevich! 

llvm-svn: 220031
This commit is contained in:
Artyom Skrobov 2014-10-17 10:22:03 +00:00
parent 031e817630
commit 5e63acc448
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/AST/RecordLayoutBuilder.cpp
View File

@ -1335,6 +1335,14 @@ void RecordLayoutBuilder::LayoutFields(const RecordDecl *D) {
LayoutField(Field, InsertExtraPadding); LayoutField(Field, InsertExtraPadding);
} }
// Rounds the specified size to have it a multiple of the char size.
static uint64_t
roundUpSizeToCharAlignment(uint64_t Size,
const ASTContext &Context) {
uint64_t CharAlignment = Context.getTargetInfo().getCharAlign();
return llvm::RoundUpToAlignment(Size, CharAlignment);
}
void RecordLayoutBuilder::LayoutWideBitField(uint64_t FieldSize, void RecordLayoutBuilder::LayoutWideBitField(uint64_t FieldSize,
uint64_t TypeSize, uint64_t TypeSize,
bool FieldPacked, bool FieldPacked,
@ -1372,7 +1380,9 @@ void RecordLayoutBuilder::LayoutWideBitField(uint64_t FieldSize,
uint64_t UnpaddedFieldOffset = getDataSizeInBits() - UnfilledBitsInLastUnit; uint64_t UnpaddedFieldOffset = getDataSizeInBits() - UnfilledBitsInLastUnit;
if (IsUnion) { if (IsUnion) {
setDataSize(std::max(getDataSizeInBits(), FieldSize)); uint64_t RoundedFieldSize = roundUpSizeToCharAlignment(FieldSize,
Context);
setDataSize(std::max(getDataSizeInBits(), RoundedFieldSize));
FieldOffset = 0; FieldOffset = 0;
} else { } else {
// The bitfield is allocated starting at the next offset aligned // The bitfield is allocated starting at the next offset aligned
@ -1597,9 +1607,9 @@ void RecordLayoutBuilder::LayoutBitField(const FieldDecl *D) {
// For unions, this is just a max operation, as usual. // For unions, this is just a max operation, as usual.
if (IsUnion) { if (IsUnion) {
// FIXME: I think FieldSize should be TypeSize here. uint64_t RoundedFieldSize = roundUpSizeToCharAlignment(FieldSize,
setDataSize(std::max(getDataSizeInBits(), FieldSize)); Context);
setDataSize(std::max(getDataSizeInBits(), RoundedFieldSize));
// For non-zero-width bitfields in ms_struct structs, allocate a new // For non-zero-width bitfields in ms_struct structs, allocate a new
// storage unit if necessary. // storage unit if necessary.
} else if (IsMsStruct && FieldSize) { } else if (IsMsStruct && FieldSize) {