summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGExprScalar.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2010-04-24 21:27:51 +0000
committerAnders Carlsson <andersca@mac.com>2010-04-24 21:27:51 +0000
commit795213efde00f099ee0ccade01e09ed791aac199 (patch)
treee4fba195d104fb7d1d130d6930e9333cd1a4f0ae /clang/lib/CodeGen/CGExprScalar.cpp
parent8a64c1c94c1e2280fbf49d0689afe563e3f4b7b1 (diff)
downloadbcm5719-llvm-795213efde00f099ee0ccade01e09ed791aac199.tar.gz
bcm5719-llvm-795213efde00f099ee0ccade01e09ed791aac199.zip
Get rid of the old GetNonVirtualBaseClassOffset and change all call sites to use the new version.
llvm-svn: 102274
Diffstat (limited to 'clang/lib/CodeGen/CGExprScalar.cpp')
-rw-r--r--clang/lib/CodeGen/CGExprScalar.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index ad072c6d01b..842590b24ca 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -888,7 +888,8 @@ Value *ScalarExprEmitter::EmitCastExpr(CastExpr *CE) {
std::swap(DerivedDecl, BaseDecl);
if (llvm::Constant *Adj =
- CGF.CGM.GetNonVirtualBaseClassOffset(DerivedDecl, BaseDecl)) {
+ CGF.CGM.GetNonVirtualBaseClassOffset(DerivedDecl,
+ CE->getBasePath())) {
if (CE->getCastKind() == CastExpr::CK_DerivedToBaseMemberPointer)
Src = Builder.CreateSub(Src, Adj, "adj");
else
OpenPOWER on IntegriCloud