diff options
| -rw-r--r-- | clang/lib/AST/RecordLayoutBuilder.cpp | 14 | ||||
| -rw-r--r-- | clang/lib/AST/RecordLayoutBuilder.h | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp index f4257b7d0ef..41272fdbfea 100644 --- a/clang/lib/AST/RecordLayoutBuilder.cpp +++ b/clang/lib/AST/RecordLayoutBuilder.cpp @@ -32,11 +32,7 @@ void ASTRecordLayoutBuilder::Layout(const RecordDecl *D) { if (const AlignedAttr *AA = D->getAttr<AlignedAttr>()) UpdateAlignment(AA->getAlignment()); - // Layout each field, for now, just sequentially, respecting alignment. In - // the future, this will need to be tweakable by targets. - for (RecordDecl::field_iterator Field = D->field_begin(), - FieldEnd = D->field_end(); Field != FieldEnd; ++Field) - LayoutField(*Field); + LayoutFields(D); // Finally, round the size of the total struct up to the alignment of the // struct itself. @@ -73,6 +69,14 @@ void ASTRecordLayoutBuilder::Layout(const ObjCInterfaceDecl *D, FinishLayout(); } +void ASTRecordLayoutBuilder::LayoutFields(const RecordDecl *D) { + // Layout each field, for now, just sequentially, respecting alignment. In + // the future, this will need to be tweakable by targets. + for (RecordDecl::field_iterator Field = D->field_begin(), + FieldEnd = D->field_end(); Field != FieldEnd; ++Field) + LayoutField(*Field); +} + void ASTRecordLayoutBuilder::LayoutField(const FieldDecl *D) { unsigned FieldPacking = StructPacking; uint64_t FieldOffset = IsUnion ? 0 : Size; diff --git a/clang/lib/AST/RecordLayoutBuilder.h b/clang/lib/AST/RecordLayoutBuilder.h index cff407c5417..4a71b2b0ebb 100644 --- a/clang/lib/AST/RecordLayoutBuilder.h +++ b/clang/lib/AST/RecordLayoutBuilder.h @@ -37,6 +37,7 @@ class ASTRecordLayoutBuilder { void Layout(const ObjCInterfaceDecl *D, const ObjCImplementationDecl *Impl); + void LayoutFields(const RecordDecl *D); void LayoutField(const FieldDecl *D); /// FinishLayout - Finalize record layout. Adjust record size based on the |
