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/CGExprAgg.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/CGExprAgg.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprAgg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index 2cbaa1153cd..bc8a45b2fae 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -252,8 +252,8 @@ void AggExprEmitter::VisitCastExpr(CastExpr *E) { if (E->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 (E->getCastKind() == CastExpr::CK_DerivedToBaseMemberPointer) SrcAdj = Builder.CreateSub(SrcAdj, Adj, "adj"); else |
