commit 77fae58f6dedd85c2506100e1754a2233a9c5e3a
author Anders Carlsson <andersca@mac.com> Sun May 02 23:57:15 2010 +0000
committer Anders Carlsson <andersca@mac.com> Sun May 02 23:57:15 2010 +0000
tree f88579533946bd0cebd6599d55c3a907253eaa3c
parent c11bb2191088b9e74bec5007a4e05c78b41a8f64

Get rid of a call to GetAddressOfDirectBaseInCompleteClass.

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

lib/CodeGen/CGClass.cpp

diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp
index 93b1897..634d317 100644
--- a/lib/CodeGen/CGClass.cpp
+++ b/lib/CodeGen/CGClass.cpp
@@ -1020,10 +1020,13 @@
     // Ignore trivial destructors.
     if (BaseClassDecl->hasTrivialDestructor())
       continue;
-    const CXXDestructorDecl *D = BaseClassDecl->getDestructor(getContext());
-    
-    llvm::Value *V = OldGetAddressOfBaseClass(LoadCXXThis(),
-                                              ClassDecl, BaseClassDecl);
+
+    const CXXDestructorDecl *D = BaseClassDecl->getDestructor(getContext());    
+    llvm::Value *V = 
+      GetAddressOfDirectBaseInCompleteClass(LoadCXXThis(), ClassDecl, 
+                                            BaseClassDecl, 
+                                            /*BaseIsVirtual=*/false);
+
     EmitCXXDestructorCall(D, Dtor_Base, /*ForVirtualBase=*/false, V);
   }
 }