ir-gen derived-to-base conversion in implicit casts.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77374 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index cbca7aa..5ded216 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -440,8 +440,22 @@
// pointer type.
if (isa<llvm::PointerType>(DstTy)) {
// The source value may be an integer, or a pointer.
- if (isa<llvm::PointerType>(Src->getType()))
+ if (isa<llvm::PointerType>(Src->getType())) {
+ // Some heavy lifting for derived to base conversion.
+ if (const PointerType *PT = SrcType->getAsPointerType()) {
+ QualType SrcClassTy = PT->getPointeeType();
+ if (const RecordType *RT = SrcClassTy->getAsRecordType())
+ if (CXXRecordDecl *ClassDecl =
+ dyn_cast<CXXRecordDecl>(RT->getDecl())) {
+ QualType DstClassType = DstType->getPointeeType();
+ if (const RecordType *DRT = DstClassType->getAsRecordType())
+ if (CXXRecordDecl *BaseClassDecl =
+ dyn_cast<CXXRecordDecl>(DRT->getDecl()))
+ Src = CGF.AddressCXXOfBaseClass(Src, ClassDecl, BaseClassDecl);
+ }
+ }
return Builder.CreateBitCast(Src, DstTy, "conv");
+ }
assert(SrcType->isIntegerType() && "Not ptr->ptr or int->ptr conversion?");
// First, convert to the correct width so that we control the kind of
// extension.