diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-06-08 22:30:17 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-06-08 22:30:17 +0000 |
| commit | 9eb101c5d39054e3b6d7c67150545156aaf77681 (patch) | |
| tree | 4e0234508812b1229a5fbcfbf81a998235709b6f | |
| parent | 282bc10eaad88a50a0cebbf827b2ddcf76c22d27 (diff) | |
| download | bcm5719-llvm-9eb101c5d39054e3b6d7c67150545156aaf77681.tar.gz bcm5719-llvm-9eb101c5d39054e3b6d7c67150545156aaf77681.zip | |
Rename __tcf_ to __cxx_global_array_dtor. Remove the UniqueAggreDestructorCount from CodeGenFunction and let LLVM handle uniquing the internal functions instead.
llvm-svn: 105648
| -rw-r--r-- | clang/lib/CodeGen/CGDeclCXX.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.h | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp index 340f6a5a95e..583e9617879 100644 --- a/clang/lib/CodeGen/CGDeclCXX.cpp +++ b/clang/lib/CodeGen/CGDeclCXX.cpp @@ -436,14 +436,13 @@ CodeGenFunction::GenerateCXXAggrDestructorHelper(const CXXDestructorDecl *D, getContext().getPointerType(getContext().VoidTy)); Args.push_back(std::make_pair(Dst, Dst->getType())); - llvm::SmallString<16> Name; - llvm::raw_svector_ostream(Name) << "__tcf_" << (++UniqueAggrDestructorCount); const CGFunctionInfo &FI = CGM.getTypes().getFunctionInfo(getContext().VoidTy, Args, FunctionType::ExtInfo()); const llvm::FunctionType *FTy = CGM.getTypes().GetFunctionType(FI, false); llvm::Function *Fn = - llvm::Function::Create(FTy, llvm::GlobalValue::InternalLinkage, Name.str(), + llvm::Function::Create(FTy, llvm::GlobalValue::InternalLinkage, + "__cxx_global_array_dtor", &CGM.getModule()); StartFunction(GlobalDecl(), getContext().VoidTy, Fn, Args, SourceLocation()); diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 73de0fd7738..af062356f65 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -31,8 +31,7 @@ CodeGenFunction::CodeGenFunction(CodeGenModule &cgm) DebugInfo(0), IndirectBranch(0), SwitchInsn(0), CaseRangeBlock(0), InvokeDest(0), CXXThisDecl(0), CXXThisValue(0), CXXVTTDecl(0), CXXVTTValue(0), - ConditionalBranchLevel(0), TerminateHandler(0), TrapBB(0), - UniqueAggrDestructorCount(0) { + ConditionalBranchLevel(0), TerminateHandler(0), TrapBB(0) { LLVMIntTy = ConvertType(getContext().IntTy); LLVMPointerWidth = Target.getPointerWidth(0); Exceptions = getContext().getLangOptions().Exceptions; diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index 21c08577693..0682a0474b5 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/lib/CodeGen/CodeGenFunction.h @@ -456,7 +456,6 @@ private: llvm::BasicBlock *TerminateHandler; llvm::BasicBlock *TrapBB; - int UniqueAggrDestructorCount; public: CodeGenFunction(CodeGenModule &cgm); |
