From 09b5fe68ab35484cae30250abc322f5fd33e6059 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 9 Jun 2010 02:30:12 +0000 Subject: [PATCH] More mangling cleanup. llvm-svn: 105672 --- clang/lib/CodeGen/CGCXX.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp index 60f1f6f7ebad..137fbc0e8768 100644 --- a/clang/lib/CodeGen/CGCXX.cpp +++ b/clang/lib/CodeGen/CGCXX.cpp @@ -218,8 +218,10 @@ void CodeGenModule::EmitCXXConstructor(const CXXConstructorDecl *D, llvm::GlobalValue * CodeGenModule::GetAddrOfCXXConstructor(const CXXConstructorDecl *D, CXXCtorType Type) { + GlobalDecl GD(D, Type); + MangleBuffer Name; - getMangledCXXCtorName(Name, D, Type); + getMangledName(Name, GD); if (llvm::GlobalValue *V = GetGlobalValue(Name)) return V; @@ -227,8 +229,7 @@ CodeGenModule::GetAddrOfCXXConstructor(const CXXConstructorDecl *D, const llvm::FunctionType *FTy = getTypes().GetFunctionType(getTypes().getFunctionInfo(D, Type), FPT->isVariadic()); - return cast( - GetOrCreateLLVMFunction(Name, FTy, GlobalDecl(D, Type))); + return cast(GetOrCreateLLVMFunction(Name, FTy, GD)); } void CodeGenModule::getMangledName(MangleBuffer &Buffer, const BlockDecl *BD) { @@ -286,16 +287,17 @@ void CodeGenModule::EmitCXXDestructor(const CXXDestructorDecl *D, llvm::GlobalValue * CodeGenModule::GetAddrOfCXXDestructor(const CXXDestructorDecl *D, CXXDtorType Type) { + GlobalDecl GD(D, Type); + MangleBuffer Name; - getMangledCXXDtorName(Name, D, Type); + getMangledName(Name, GD); if (llvm::GlobalValue *V = GetGlobalValue(Name)) return V; const llvm::FunctionType *FTy = getTypes().GetFunctionType(getTypes().getFunctionInfo(D, Type), false); - return cast( - GetOrCreateLLVMFunction(Name, FTy, GlobalDecl(D, Type))); + return cast(GetOrCreateLLVMFunction(Name, FTy, GD)); } void CodeGenModule::getMangledCXXDtorName(MangleBuffer &Name,