diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-09-11 15:42:06 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-09-11 15:42:06 +0000 |
| commit | 9b9fda54de05b0bbcc4a2e61af4f48c7f1ea8efc (patch) | |
| tree | a61bbab3194c7339385327d67a4839d2fbd94f1a /lib/CodeGen/CGCXX.cpp | |
| parent | ad7408609a740737cb6005948429a22ad50e3a48 (diff) | |
| download | clang-9b9fda54de05b0bbcc4a2e61af4f48c7f1ea8efc.tar.gz | |
Merge GetAddrOfCXXConstructor and GetAddrOfCXXDonstructor. NFC.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@217598 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGCXX.cpp')
| -rw-r--r-- | lib/CodeGen/CGCXX.cpp | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index 583017cfcd..6244c3b3d2 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -215,8 +215,8 @@ void CodeGenModule::EmitCXXConstructor(const CXXConstructorDecl *ctor, const CGFunctionInfo &fnInfo = getTypes().arrangeCXXStructorDeclaration(ctor, getFromCtorType(ctorType)); - auto *fn = cast<llvm::Function>( - GetAddrOfCXXConstructor(ctor, ctorType, &fnInfo, true)); + auto *fn = cast<llvm::Function>(getAddrOfCXXStructor( + ctor, getFromCtorType(ctorType), &fnInfo, nullptr, true)); setFunctionLinkage(GlobalDecl(ctor, ctorType), fn); CodeGenFunction(*this).GenerateCode(GlobalDecl(ctor, ctorType), fn, fnInfo); @@ -251,13 +251,6 @@ llvm::GlobalValue *CodeGenModule::getAddrOfCXXStructor( DontDefer)); } -llvm::GlobalValue *CodeGenModule::GetAddrOfCXXConstructor( - const CXXConstructorDecl *ctor, CXXCtorType ctorType, - const CGFunctionInfo *fnInfo, bool DontDefer) { - return getAddrOfCXXStructor(ctor, getFromCtorType(ctorType), fnInfo, nullptr, - DontDefer); -} - void CodeGenModule::EmitCXXDestructor(const CXXDestructorDecl *dtor, CXXDtorType dtorType) { // The complete destructor is equivalent to the base destructor for @@ -285,8 +278,8 @@ void CodeGenModule::EmitCXXDestructor(const CXXDestructorDecl *dtor, const CGFunctionInfo &fnInfo = getTypes().arrangeCXXStructorDeclaration(dtor, getFromDtorType(dtorType)); - auto *fn = cast<llvm::Function>( - GetAddrOfCXXDestructor(dtor, dtorType, &fnInfo, nullptr, true)); + auto *fn = cast<llvm::Function>(getAddrOfCXXStructor( + dtor, getFromDtorType(dtorType), &fnInfo, nullptr, true)); setFunctionLinkage(GlobalDecl(dtor, dtorType), fn); CodeGenFunction(*this).GenerateCode(GlobalDecl(dtor, dtorType), fn, fnInfo); @@ -295,16 +288,6 @@ void CodeGenModule::EmitCXXDestructor(const CXXDestructorDecl *dtor, SetLLVMFunctionAttributesForDefinition(dtor, fn); } -llvm::GlobalValue * -CodeGenModule::GetAddrOfCXXDestructor(const CXXDestructorDecl *dtor, - CXXDtorType dtorType, - const CGFunctionInfo *fnInfo, - llvm::FunctionType *fnType, - bool DontDefer) { - return getAddrOfCXXStructor(dtor, getFromDtorType(dtorType), fnInfo, fnType, - DontDefer); -} - static llvm::Value *BuildAppleKextVirtualCall(CodeGenFunction &CGF, GlobalDecl GD, llvm::Type *Ty, |