commit 1ac0ec86b7e2ee499cc1bbf3916cd36aac6dd5ee
author Rafael Espindola <rafael.espindola@gmail.com> Thu Sep 11 15:42:06 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Sep 11 15:42:06 2014 +0000
tree 8308e4f5e5408eb72264d4ac5e331d8e5e63cac4
parent 4cb54e0a789392b1109f4ca1cb80fba5411aa449

Merge GetAddrOfCXXConstructor and GetAddrOfCXXDonstructor. NFC.

llvm-svn: 217598

clang/lib/CodeGen/CGClass.cpp

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 73afe23..1de325f 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -1681,7 +1681,7 @@
       *this, D, Type, ForVirtualBase, Delegating, Args);
 
   // Emit the call.
-  llvm::Value *Callee = CGM.GetAddrOfCXXConstructor(D, Type);
+  llvm::Value *Callee = CGM.getAddrOfCXXStructor(D, getFromCtorType(Type));
   const CGFunctionInfo &Info =
       CGM.getTypes().arrangeCXXConstructorCall(Args, D, Type, ExtraArgs);
   EmitCall(Info, Callee, ReturnValueSlot(), Args, D);
@@ -1698,7 +1698,7 @@
     EmitAggregateCopy(This, Src, E->arg_begin()->getType());
     return;
   }
-  llvm::Value *Callee = CGM.GetAddrOfCXXConstructor(D, clang::Ctor_Complete);
+  llvm::Value *Callee = CGM.getAddrOfCXXStructor(D, StructorType::Complete);
   assert(D->isInstance() &&
          "Trying to emit a member call expr on a static method!");
   
@@ -1758,7 +1758,8 @@
     EmitDelegateCallArg(DelegateArgs, param, Loc);
   }
 
-  llvm::Value *Callee = CGM.GetAddrOfCXXConstructor(Ctor, CtorType);
+  llvm::Value *Callee =
+      CGM.getAddrOfCXXStructor(Ctor, getFromCtorType(CtorType));
   EmitCall(CGM.getTypes()
                .arrangeCXXStructorDeclaration(Ctor, getFromCtorType(CtorType)),
            Callee, ReturnValueSlot(), DelegateArgs, Ctor);