replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More overriding base work and some cleanups. WIP. 

llvm-svn: 80737
This commit is contained in:
Mike Stump 2009-09-01 23:22:44 +00:00
parent fcd618bf1d
commit 2348e62498
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
clang/lib/CodeGen/CGCXX.cpp
View File

@ -930,10 +930,20 @@ public:
return false; return false;
} }
void OverrideMethods(const CXXRecordDecl *RD, Index_t AddressPoint,
bool MorallyVirtual, Index_t Offset) {
for (method_iter mi = RD->method_begin(), me = RD->method_end(); mi != me;
++mi)
if (mi->isVirtual()) {
const CXXMethodDecl *MD = *mi;
llvm::Constant *m = wrap(CGM.GetAddrOfFunction(GlobalDecl(MD), Ptr8Ty));
OverrideMethod(MD, m, MorallyVirtual, Offset);
}
}
void AddMethod(const CXXMethodDecl *MD, Index_t AddressPoint, void AddMethod(const CXXMethodDecl *MD, Index_t AddressPoint,
bool MorallyVirtual, Index_t Offset) { bool MorallyVirtual, Index_t Offset) {
llvm::Constant *m; llvm::Constant *m = wrap(CGM.GetAddrOfFunction(GlobalDecl(MD), Ptr8Ty));
m = wrap(CGM.GetAddrOfFunction(GlobalDecl(MD), Ptr8Ty));
if (OverrideMethod(MD, m, MorallyVirtual, Offset)) if (OverrideMethod(MD, m, MorallyVirtual, Offset))
return; return;
@ -953,19 +963,17 @@ public:
submethods.push_back(m); submethods.push_back(m);
} }
void GenerateMethods(const CXXRecordDecl *RD, Index_t AddressPoint, void AddMethods(const CXXRecordDecl *RD, Index_t AddressPoint,
bool MorallyVirtual, Index_t Offset) { bool MorallyVirtual, Index_t Offset) {
for (method_iter mi = RD->method_begin(), me = RD->method_end(); mi != me; for (method_iter mi = RD->method_begin(), me = RD->method_end(); mi != me;
++mi) ++mi)
if (mi->isVirtual()) if (mi->isVirtual())
AddMethod(*mi, AddressPoint, MorallyVirtual, Offset); AddMethod(*mi, AddressPoint, MorallyVirtual, Offset);
} }
int64_t GenerateVtableForBase(const CXXRecordDecl *RD, int64_t GenerateVtableForBase(const CXXRecordDecl *RD, bool forPrimary,
bool forPrimary, bool Bottom, bool Bottom, bool MorallyVirtual,
bool MorallyVirtual, int64_t Offset, bool ForVirtualBase) {
int64_t Offset,
bool ForVirtualBase) {
llvm::Constant *m = llvm::Constant::getNullValue(Ptr8Ty); llvm::Constant *m = llvm::Constant::getNullValue(Ptr8Ty);
int64_t AddressPoint=0; int64_t AddressPoint=0;
@ -995,7 +1003,7 @@ public:
} }
// And add the virtuals for the class to the primary vtable. // And add the virtuals for the class to the primary vtable.
GenerateMethods(RD, AddressPoint, MorallyVirtual, Offset); AddMethods(RD, AddressPoint, MorallyVirtual, Offset);
if (!Bottom) if (!Bottom)
return AddressPoint; return AddressPoint;
@ -1022,14 +1030,7 @@ public:
methods.push_back(*i); methods.push_back(*i);
} }
int64_t BaseOffset; m = wrap(-(Offset/8));
if (ForVirtualBase) {
BaseOffset = -(BLayout.getVBaseClassOffset(RD) / 8);
// FIXME: The above is redundant with the other case.
assert(BaseOffset == -Offset/8);
} else
BaseOffset = -Offset/8;
m = wrap(BaseOffset);
methods.push_back(m); methods.push_back(m);
methods.push_back(rtti); methods.push_back(rtti);
AddressPoint = methods.size(); AddressPoint = methods.size();