diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-09-12 04:26:35 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-09-12 04:26:35 +0000 |
| commit | 5a0f49ebc83e7fe0da07b9964c44b0a7fae270cb (patch) | |
| tree | c900291261456eca4846d7b724bd5f69f245099a /lib/CodeGen/CGExprScalar.cpp | |
| parent | 29f898a36b1d2023ba0fd6cdaf2d955332f3b137 (diff) | |
Rename AddressCXXOfBaseClass to GetAddressCXXOfBaseClass. Add a NullCheckValue argument (currently unused).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81606 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index aecf955863..ef323c14ba 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -468,11 +468,13 @@ Value *ScalarExprEmitter::EmitScalarConversion(Value *Src, QualType SrcType, // The source value may be an integer, or a pointer. if (isa<llvm::PointerType>(Src->getType())) { // Some heavy lifting for derived to base conversion. + // FIXME: This should be handled by EmitCast. if (const CXXRecordDecl *ClassDecl = SrcType->getCXXRecordDeclForPointerType()) if (const CXXRecordDecl *BaseClassDecl = DstType->getCXXRecordDeclForPointerType()) - Src = CGF.AddressCXXOfBaseClass(Src, ClassDecl, BaseClassDecl); + Src = CGF.GetAddressCXXOfBaseClass(Src, ClassDecl, BaseClassDecl, + /*NullCheckValue=*/false); return Builder.CreateBitCast(Src, DstTy, "conv"); } assert(SrcType->isIntegerType() && "Not ptr->ptr or int->ptr conversion?"); |