[cfe-commits] r102886 - /cfe/trunk/lib/CodeGen/CGClass.cpp

[Anders Carlsson]

Author: andersca
Date: Sun May  2 18:57:15 2010
New Revision: 102886

URL: http://llvm.org/viewvc/llvm-project?rev=102886&view=rev
Log:
Get rid of a call to GetAddressOfDirectBaseInCompleteClass.

Modified:
    cfe/trunk/lib/CodeGen/CGClass.cpp

Modified: cfe/trunk/lib/CodeGen/CGClass.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=102886&r1=102885&r2=102886&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGClass.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGClass.cpp Sun May  2 18:57:15 2010
@@ -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);
   }
 }