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 | 84673e200fd979535dd2c8e2d845063fc2dde072 (patch) | |
| tree | 6b009cf3f5caec1dd0416af21ce7447131689fd2 /clang/lib/CodeGen/CGExprScalar.cpp | |
| parent | d86d3fe0c33bea37595084129cea46ab2241d33c (diff) | |
| download | bcm5719-llvm-84673e200fd979535dd2c8e2d845063fc2dde072.tar.gz bcm5719-llvm-84673e200fd979535dd2c8e2d845063fc2dde072.zip | |
Some class related cleanup.
llvm-svn: 94938
Diffstat (limited to 'clang/lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 690a7dc2fde..3ca86b80588 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/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 |
