Add CGCXXClass.cpp. and move CodeGenFunction::AddressCXXOfBaseClass there.
llvm-svn: 81604
This commit is contained in:
parent
57dba6768e
commit
307408d2af
|
@ -31,6 +31,7 @@
|
|||
1A32C17F0E1C87AD00A6B483 /* ExprConstant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A32C17E0E1C87AD00A6B483 /* ExprConstant.cpp */; };
|
||||
1A376A2D0D4AED9B002A1C52 /* CGExprConstant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A376A2C0D4AED9B002A1C52 /* CGExprConstant.cpp */; };
|
||||
1A471AB50F437BC500753CE8 /* CGBlocks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A471AB40F437BC500753CE8 /* CGBlocks.cpp */; };
|
||||
1A4C41BF105B4C0B0047B5E7 /* CGCXXClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4C41BE105B4C0B0047B5E7 /* CGCXXClass.cpp */; };
|
||||
1A5119C40FBDF71000A1FF22 /* SemaTemplateInstantiateStmt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5119C30FBDF71000A1FF22 /* SemaTemplateInstantiateStmt.cpp */; };
|
||||
1A5D5E580E5E81010023C059 /* CGCXX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5D5E570E5E81010023C059 /* CGCXX.cpp */; };
|
||||
1A6FE7090FD6F85800E00CA9 /* CGCXXTemp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FE7080FD6F85800E00CA9 /* CGCXXTemp.cpp */; };
|
||||
|
@ -361,6 +362,7 @@
|
|||
1A32C17E0E1C87AD00A6B483 /* ExprConstant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = ExprConstant.cpp; path = lib/AST/ExprConstant.cpp; sourceTree = "<group>"; tabWidth = 2; };
|
||||
1A376A2C0D4AED9B002A1C52 /* CGExprConstant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGExprConstant.cpp; path = lib/CodeGen/CGExprConstant.cpp; sourceTree = "<group>"; tabWidth = 2; };
|
||||
1A471AB40F437BC500753CE8 /* CGBlocks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGBlocks.cpp; path = lib/CodeGen/CGBlocks.cpp; sourceTree = "<group>"; tabWidth = 2; };
|
||||
1A4C41BE105B4C0B0047B5E7 /* CGCXXClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CGCXXClass.cpp; path = lib/CodeGen/CGCXXClass.cpp; sourceTree = "<group>"; };
|
||||
1A5119C30FBDF71000A1FF22 /* SemaTemplateInstantiateStmt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = SemaTemplateInstantiateStmt.cpp; path = lib/Sema/SemaTemplateInstantiateStmt.cpp; sourceTree = "<group>"; tabWidth = 2; };
|
||||
1A5D5E570E5E81010023C059 /* CGCXX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CGCXX.cpp; path = lib/CodeGen/CGCXX.cpp; sourceTree = "<group>"; tabWidth = 2; };
|
||||
1A649E1D0F9599D9005B965E /* CGBlocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CGBlocks.h; path = lib/CodeGen/CGBlocks.h; sourceTree = "<group>"; };
|
||||
|
@ -1240,6 +1242,7 @@
|
|||
35475B220E7997680000BFE4 /* CGCall.h */,
|
||||
1A5D5E570E5E81010023C059 /* CGCXX.cpp */,
|
||||
1A649E1E0F9599DA005B965E /* CGCXX.h */,
|
||||
1A4C41BE105B4C0B0047B5E7 /* CGCXXClass.cpp */,
|
||||
1A6FE7080FD6F85800E00CA9 /* CGCXXTemp.cpp */,
|
||||
35A3E7000DD3874400757F74 /* CGDebugInfo.cpp */,
|
||||
35A3E7010DD3874400757F74 /* CGDebugInfo.h */,
|
||||
|
@ -1879,6 +1882,7 @@
|
|||
9012911D1048068D0083456D /* ASTUnit.cpp in Sources */,
|
||||
90129121104812F90083456D /* CIndex.cpp in Sources */,
|
||||
90F9EFAA104ABDED00D09A15 /* c-index-test.c in Sources */,
|
||||
1A4C41BF105B4C0B0047B5E7 /* CGCXXClass.cpp in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
|
@ -276,73 +276,6 @@ llvm::Value *CodeGenFunction::LoadCXXThis() {
|
|||
return Builder.CreateLoad(LocalDeclMap[CXXThisDecl], "this");
|
||||
}
|
||||
|
||||
static bool
|
||||
GetNestedPaths(llvm::SmallVectorImpl<const CXXRecordDecl *> &NestedBasePaths,
|
||||
const CXXRecordDecl *ClassDecl,
|
||||
const CXXRecordDecl *BaseClassDecl) {
|
||||
for (CXXRecordDecl::base_class_const_iterator i = ClassDecl->bases_begin(),
|
||||
e = ClassDecl->bases_end(); i != e; ++i) {
|
||||
if (i->isVirtual())
|
||||
continue;
|
||||
const CXXRecordDecl *Base =
|
||||
cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
|
||||
if (Base == BaseClassDecl) {
|
||||
NestedBasePaths.push_back(BaseClassDecl);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
// BaseClassDecl not an immediate base of ClassDecl.
|
||||
for (CXXRecordDecl::base_class_const_iterator i = ClassDecl->bases_begin(),
|
||||
e = ClassDecl->bases_end(); i != e; ++i) {
|
||||
if (i->isVirtual())
|
||||
continue;
|
||||
const CXXRecordDecl *Base =
|
||||
cast<CXXRecordDecl>(i->getType()->getAs<RecordType>()->getDecl());
|
||||
if (GetNestedPaths(NestedBasePaths, Base, BaseClassDecl)) {
|
||||
NestedBasePaths.push_back(Base);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
llvm::Value *CodeGenFunction::AddressCXXOfBaseClass(llvm::Value *BaseValue,
|
||||
const CXXRecordDecl *ClassDecl,
|
||||
const CXXRecordDecl *BaseClassDecl) {
|
||||
if (ClassDecl == BaseClassDecl)
|
||||
return BaseValue;
|
||||
|
||||
llvm::Type *I8Ptr = llvm::PointerType::getUnqual(llvm::Type::getInt8Ty(VMContext));
|
||||
llvm::SmallVector<const CXXRecordDecl *, 16> NestedBasePaths;
|
||||
GetNestedPaths(NestedBasePaths, ClassDecl, BaseClassDecl);
|
||||
assert(NestedBasePaths.size() > 0 &&
|
||||
"AddressCXXOfBaseClass - inheritence path failed");
|
||||
NestedBasePaths.push_back(ClassDecl);
|
||||
uint64_t Offset = 0;
|
||||
|
||||
// Accessing a member of the base class. Must add delata to
|
||||
// the load of 'this'.
|
||||
for (unsigned i = NestedBasePaths.size()-1; i > 0; i--) {
|
||||
const CXXRecordDecl *DerivedClass = NestedBasePaths[i];
|
||||
const CXXRecordDecl *BaseClass = NestedBasePaths[i-1];
|
||||
const ASTRecordLayout &Layout =
|
||||
getContext().getASTRecordLayout(DerivedClass);
|
||||
Offset += Layout.getBaseClassOffset(BaseClass) / 8;
|
||||
}
|
||||
llvm::Value *OffsetVal =
|
||||
llvm::ConstantInt::get(
|
||||
CGM.getTypes().ConvertType(CGM.getContext().LongTy), Offset);
|
||||
BaseValue = Builder.CreateBitCast(BaseValue, I8Ptr);
|
||||
BaseValue = Builder.CreateGEP(BaseValue, OffsetVal, "add.ptr");
|
||||
QualType BTy =
|
||||
getContext().getCanonicalType(
|
||||
getContext().getTypeDeclType(const_cast<CXXRecordDecl*>(BaseClassDecl)));
|
||||
const llvm::Type *BasePtr = ConvertType(BTy);
|
||||
BasePtr = llvm::PointerType::getUnqual(BasePtr);
|
||||
BaseValue = Builder.CreateBitCast(BaseValue, BasePtr);
|
||||
return BaseValue;
|
||||
}
|
||||
|
||||
/// EmitCXXAggrConstructorCall - This routine essentially creates a (nested)
|
||||
/// for-loop to call the default constructor on individual members of the
|
||||
/// array. 'Array' is the array type, 'This' is llvm pointer of the start
|
||||
|
|
Loading…
Reference in New Issue