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

Remove hacks from ASTContext now that alignment gets reported correctly. 

llvm-svn: 51322
This commit is contained in:
Eli Friedman 2008-05-20 15:17:39 +00:00
parent 7cef49e2d8
commit cc6b071c1e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/AST/ASTContext.cpp
View File

@ -354,11 +354,7 @@ const ASTRecordLayout &ASTContext::getASTRecordLayout(const RecordDecl *D) {
else if (FieldIsPacked)
FieldAlign = 8;
else {
// FIXME: This is X86 specific, use 32-bit alignment for long long.
if (FD->getType()->isIntegerType() && TypeInfo.second > 32)
FieldAlign = 32;
else
FieldAlign = TypeInfo.second;
FieldAlign = TypeInfo.second;
}
// Check if we need to add padding to give the field the correct
@ -418,17 +414,13 @@ const ASTRecordLayout &ASTContext::getASTRecordLayout(const RecordDecl *D) {
std::pair<uint64_t, unsigned> FieldInfo = getTypeInfo(FD->getType());
uint64_t FieldSize = FieldInfo.first;
unsigned FieldAlign = FieldInfo.second;
// FIXME: This is X86 specific, use 32-bit alignment for long long.
if (FD->getType()->isIntegerType() && FieldAlign > 32)
FieldAlign = 32;
// Round up the current record size to the field's alignment boundary.
RecordSize = std::max(RecordSize, FieldSize);
// Place this field at the start of the record.
FieldOffsets[i] = 0;
// Remember max struct/class alignment.
RecordAlign = std::max(RecordAlign, FieldAlign);
}