diff options
Diffstat (limited to 'clang/lib/AST')
| -rw-r--r-- | clang/lib/AST/RecordLayout.cpp | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/clang/lib/AST/RecordLayout.cpp b/clang/lib/AST/RecordLayout.cpp index a296a2409a4..2dbe737d044 100644 --- a/clang/lib/AST/RecordLayout.cpp +++ b/clang/lib/AST/RecordLayout.cpp @@ -48,7 +48,7 @@ ASTRecordLayout::ASTRecordLayout(ASTContext &Ctx,                                   unsigned nonvirtualalign,                                   CharUnits SizeOfLargestEmptySubobject,                                   const CXXRecordDecl *PrimaryBase, -                                 bool PrimaryBaseIsVirtual, +                                 bool IsPrimaryBaseVirtual,                                   const BaseOffsetsMapTy& BaseOffsets,                                   const BaseOffsetsMapTy& VBaseOffsets)    : Size(size), DataSize(datasize), FieldOffsets(0), Alignment(alignment), @@ -59,7 +59,8 @@ ASTRecordLayout::ASTRecordLayout(ASTContext &Ctx,      memcpy(FieldOffsets, fieldoffsets, FieldCount * sizeof(*FieldOffsets));    } -  CXXInfo->PrimaryBase = PrimaryBaseInfo(PrimaryBase, PrimaryBaseIsVirtual); +  CXXInfo->PrimaryBase.setPointer(PrimaryBase); +  CXXInfo->PrimaryBase.setInt(IsPrimaryBaseVirtual);    CXXInfo->NonVirtualSize = nonvirtualsize;    CXXInfo->NonVirtualAlign = nonvirtualalign;    CXXInfo->SizeOfLargestEmptySubobject = SizeOfLargestEmptySubobject; | 

