From: NAKAMURA Takumi Date: Wed, 25 Feb 2015 10:32:20 +0000 (+0000) Subject: Whitespace. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed4a2aebccd636cd29bc264bee80808a8f6f97ba;p=clang Whitespace. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@230475 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index f4733cc6b7..0463471204 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/lib/AST/RecordLayoutBuilder.cpp @@ -609,10 +609,10 @@ protected: /// \brief Externally-provided size. uint64_t ExternalSize; - + /// \brief Externally-provided alignment. uint64_t ExternalAlign; - + /// \brief Externally-provided field offsets. llvm::DenseMap ExternalFieldOffsets; @@ -626,7 +626,7 @@ protected: EmptySubobjectMap *EmptySubobjects) : Context(Context), EmptySubobjects(EmptySubobjects), Size(0), Alignment(CharUnits::One()), UnpackedAlignment(CharUnits::One()), - ExternalLayout(false), InferAlignment(false), + ExternalLayout(false), InferAlignment(false), Packed(false), IsUnion(false), IsMac68kAlign(false), IsMsStruct(false), UnfilledBitsInLastUnit(0), LastBitfieldTypeSize(0), MaxFieldAlignment(CharUnits::Zero()), @@ -1236,13 +1236,13 @@ void RecordLayoutBuilder::InitializeLayout(const Decl *D) { // If there is an external AST source, ask it for the various offsets. if (const RecordDecl *RD = dyn_cast(D)) if (ExternalASTSource *External = Context.getExternalSource()) { - ExternalLayout = External->layoutRecordType(RD, + ExternalLayout = External->layoutRecordType(RD, ExternalSize, ExternalAlign, ExternalFieldOffsets, ExternalBaseOffsets, ExternalVirtualBaseOffsets); - + // Update based on external alignment. if (ExternalLayout) { if (ExternalAlign > 0) { @@ -1751,7 +1751,7 @@ void RecordLayoutBuilder::LayoutField(const FieldDecl *D, FieldOffsets.push_back(Context.toBits(FieldOffset)); if (!ExternalLayout) - CheckFieldPadding(Context.toBits(FieldOffset), UnpaddedFieldOffset, + CheckFieldPadding(Context.toBits(FieldOffset), UnpaddedFieldOffset, Context.toBits(UnpackedFieldOffset), Context.toBits(UnpackedFieldAlign), FieldPacked, D); @@ -1867,9 +1867,9 @@ RecordLayoutBuilder::updateExternalFieldOffset(const FieldDecl *Field, uint64_t ComputedOffset) { assert(ExternalFieldOffsets.find(Field) != ExternalFieldOffsets.end() && "Field does not have an external offset"); - + uint64_t ExternalFieldOffset = ExternalFieldOffsets[Field]; - + if (InferAlignment && ExternalFieldOffset < ComputedOffset) { // The externally-supplied field offset is before the field offset we // computed. Assume that the structure is packed.