diff options
| author | Dan Gohman <gohman@apple.com> | 2009-11-05 23:14:35 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2009-11-05 23:14:35 +0000 |
| commit | 568a3be545dd1ad256af69549d9b95df474bfd8f (patch) | |
| tree | 636b613854ca72aaf57d59b90606b2455f70aa9f | |
| parent | 0c8ae782cb966068f8317f8225633e2f4720ccb7 (diff) | |
| download | external_llvm-568a3be545dd1ad256af69549d9b95df474bfd8f.zip external_llvm-568a3be545dd1ad256af69549d9b95df474bfd8f.tar.gz external_llvm-568a3be545dd1ad256af69549d9b95df474bfd8f.tar.bz2 | |
Fix the label name generation for address-taken labels to avoid potential
problems with name collisions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@86189 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index bb6bd95..4c4e0d3 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -1636,13 +1636,17 @@ MCSymbol *AsmPrinter::GetBlockAddressSymbol(const Function *F, assert(BB->hasName() && "Address of anonymous basic block not supported yet!"); - // FIXME: This isn't guaranteed to produce a unique name even if the - // block and function have a name. - std::string Mangled = - Mang->getMangledName(F, Mang->makeNameProper(BB->getName()).c_str(), - /*ForcePrivate=*/true); + // This code must use the function name itself, and not the function number, + // since it must be possible to generate the label name from within other + // functions. + std::string FuncName = Mang->getMangledName(F); - return OutContext.GetOrCreateSymbol(StringRef(Mangled)); + SmallString<60> Name; + raw_svector_ostream(Name) << MAI->getPrivateGlobalPrefix() << "BA" + << FuncName.size() << '_' << FuncName << '_' + << Mang->makeNameProper(BB->getName()); + + return OutContext.GetOrCreateSymbol(Name.str()); } MCSymbol *AsmPrinter::GetMBBSymbol(unsigned MBBID) const { |