commit bb7e17b52ffaa4097b4c4d7935746d23539ffe2a
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 ff8d4abfc14ace938cbba36b4c7de52ebbb57670
parent 8958dc9bf38ddaa820425cf3a2fec346d3820f28

Some class related cleanup.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94938 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExprConstant.cpp

diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 7d5b3da..a9a07d5 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -534,8 +534,8 @@
         llvm::ConstantStruct *CS = cast<llvm::ConstantStruct>(C);
         
         // Check if we need to update the adjustment.
-        if (llvm::Constant *Offset = CGM.GetCXXBaseClassOffset(DerivedClass,
-                                                               BaseClass)) {
+        if (llvm::Constant *Offset = 
+              CGM.GetNonVirtualBaseClassOffset(DerivedClass, BaseClass)) {
           llvm::Constant *Values[2];
         
           Values[0] = CS->getOperand(0);