diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-01-31 01:36:53 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-01-31 01:36:53 +0000 |
| commit | bb7e17b52ffaa4097b4c4d7935746d23539ffe2a (patch) | |
| tree | ff8d4abfc14ace938cbba36b4c7de52ebbb57670 /lib/CodeGen/CGExprScalar.cpp | |
| parent | 8958dc9bf38ddaa820425cf3a2fec346d3820f28 (diff) | |
Some class related cleanup.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94938 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 690a7dc2fd..3ca86b8058 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -891,8 +891,8 @@ Value *ScalarExprEmitter::EmitCastExpr(CastExpr *CE) { if (CE->getCastKind() == CastExpr::CK_DerivedToBaseMemberPointer) std::swap(DerivedDecl, BaseDecl); - llvm::Constant *Adj = CGF.CGM.GetCXXBaseClassOffset(DerivedDecl, BaseDecl); - if (Adj) { + if (llvm::Constant *Adj = + CGF.CGM.GetNonVirtualBaseClassOffset(DerivedDecl, BaseDecl)) { if (CE->getCastKind() == CastExpr::CK_DerivedToBaseMemberPointer) Src = Builder.CreateSub(Src, Adj, "adj"); else |