commit 84673e200fd979535dd2c8e2d845063fc2dde072
author Anders Carlsson <andersca@mac.com> Sun Jan 31 01:36:53 2010 +0000
committer Anders Carlsson <andersca@mac.com> Sun Jan 31 01:36:53 2010 +0000
tree 6b009cf3f5caec1dd0416af21ce7447131689fd2
parent d86d3fe0c33bea37595084129cea46ab2241d33c

Some class related cleanup.

llvm-svn: 94938

clang/lib/CodeGen/CGExprAgg.cpp

diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index 2cbaa11..bc8a45b 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -252,8 +252,8 @@
     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