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

Convert BaseOffset::NonVirtualOffset to CharUnits. No change in 

functionality intended.

llvm-svn: 128756
This commit is contained in:
Ken Dyck 2011-04-02 01:32:03 +00:00
parent 511e8c0d36
commit 6b20919317
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clang/lib/CodeGen/CGVTables.cpp
View File

@ -43,15 +43,16 @@ struct BaseOffset {
/// (Or the offset from the virtual base class to the base class, if the /// (Or the offset from the virtual base class to the base class, if the
/// path from the derived class to the base class involves a virtual base /// path from the derived class to the base class involves a virtual base
/// class. /// class.
int64_t NonVirtualOffset; CharUnits NonVirtualOffset;
BaseOffset() : DerivedClass(0), VirtualBase(0), NonVirtualOffset(0) { } BaseOffset() : DerivedClass(0), VirtualBase(0),
NonVirtualOffset(CharUnits::Zero()) { }
BaseOffset(const CXXRecordDecl *DerivedClass, BaseOffset(const CXXRecordDecl *DerivedClass,
const CXXRecordDecl *VirtualBase, int64_t NonVirtualOffset) const CXXRecordDecl *VirtualBase, CharUnits NonVirtualOffset)
: DerivedClass(DerivedClass), VirtualBase(VirtualBase), : DerivedClass(DerivedClass), VirtualBase(VirtualBase),
NonVirtualOffset(NonVirtualOffset) { } NonVirtualOffset(NonVirtualOffset) { }
bool isEmpty() const { return !NonVirtualOffset && !VirtualBase; } bool isEmpty() const { return NonVirtualOffset.isZero() && !VirtualBase; }
}; };
/// FinalOverriders - Contains the final overrider member functions for all /// FinalOverriders - Contains the final overrider member functions for all
@ -214,7 +215,7 @@ FinalOverriders::FinalOverriders(const CXXRecordDecl *MostDerivedClass,
static BaseOffset ComputeBaseOffset(ASTContext &Context, static BaseOffset ComputeBaseOffset(ASTContext &Context,
const CXXRecordDecl *DerivedRD, const CXXRecordDecl *DerivedRD,
const CXXBasePath &Path) { const CXXBasePath &Path) {
int64_t NonVirtualOffset = 0; CharUnits NonVirtualOffset = CharUnits::Zero();
unsigned NonVirtualStart = 0; unsigned NonVirtualStart = 0;
const CXXRecordDecl *VirtualBase = 0; const CXXRecordDecl *VirtualBase = 0;
@ -243,13 +244,13 @@ static BaseOffset ComputeBaseOffset(ASTContext &Context,
const RecordType *BaseType = Element.Base->getType()->getAs<RecordType>(); const RecordType *BaseType = Element.Base->getType()->getAs<RecordType>();
const CXXRecordDecl *Base = cast<CXXRecordDecl>(BaseType->getDecl()); const CXXRecordDecl *Base = cast<CXXRecordDecl>(BaseType->getDecl());
NonVirtualOffset += Layout.getBaseClassOffsetInBits(Base); NonVirtualOffset += Layout.getBaseClassOffset(Base);
} }
// FIXME: This should probably use CharUnits or something. Maybe we should // FIXME: This should probably use CharUnits or something. Maybe we should
// even change the base offsets in ASTRecordLayout to be specified in // even change the base offsets in ASTRecordLayout to be specified in
// CharUnits. // CharUnits.
return BaseOffset(DerivedRD, VirtualBase, NonVirtualOffset / 8); return BaseOffset(DerivedRD, VirtualBase, NonVirtualOffset);
} }
@ -433,7 +434,7 @@ void FinalOverriders::dump(llvm::raw_ostream &Out, BaseSubobject Base,
if (Offset.VirtualBase) if (Offset.VirtualBase)
Out << Offset.VirtualBase->getQualifiedNameAsString() << " vbase, "; Out << Offset.VirtualBase->getQualifiedNameAsString() << " vbase, ";
Out << Offset.NonVirtualOffset << " nv]"; Out << Offset.NonVirtualOffset.getQuantity() << " nv]";
} }
Out << "\n"; Out << "\n";
@ -1342,7 +1343,7 @@ ReturnAdjustment VTableBuilder::ComputeReturnAdjustment(BaseOffset Offset) {
} }
} }
Adjustment.NonVirtual = Offset.NonVirtualOffset; Adjustment.NonVirtual = Offset.NonVirtualOffset.getQuantity();
} }
return Adjustment; return Adjustment;
@ -1369,8 +1370,7 @@ VTableBuilder::ComputeThisAdjustmentBaseOffset(BaseSubobject Base,
I != E; ++I) { I != E; ++I) {
BaseOffset Offset = ComputeBaseOffset(Context, DerivedRD, *I); BaseOffset Offset = ComputeBaseOffset(Context, DerivedRD, *I);
CharUnits OffsetToBaseSubobject = CharUnits OffsetToBaseSubobject = Offset.NonVirtualOffset;
CharUnits::fromQuantity(Offset.NonVirtualOffset);
if (Offset.VirtualBase) { if (Offset.VirtualBase) {
// If we have a virtual base class, the non-virtual offset is relative // If we have a virtual base class, the non-virtual offset is relative
@ -1445,7 +1445,7 @@ VTableBuilder::ComputeThisAdjustment(const CXXMethodDecl *MD,
} }
// Set the non-virtual part of the adjustment. // Set the non-virtual part of the adjustment.
Adjustment.NonVirtual = Offset.NonVirtualOffset; Adjustment.NonVirtual = Offset.NonVirtualOffset.getQuantity();
return Adjustment; return Adjustment;
} }