change Mangler::makeNameProper to return its result in a SmallVector
instead of returning it in an std::string. Based on this change:
1. Change TargetLoweringObjectFileCOFF::getCOFFSection to take a StringRef
2. Change a bunch of targets to call makeNameProper with a smallstring,
making several of them *much* more efficient.
3. Rewrite Mangler::makeNameProper to not build names and then prepend
prefixes, not use temporary std::strings, and to avoid other crimes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93298 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/TargetLoweringObjectFile.cpp b/lib/Target/TargetLoweringObjectFile.cpp
index 229b1d5..49e266c 100644
--- a/lib/Target/TargetLoweringObjectFile.cpp
+++ b/lib/Target/TargetLoweringObjectFile.cpp
@@ -492,16 +492,15 @@
}
-static unsigned
-getELFSectionType(const char *Name, SectionKind K) {
+static unsigned getELFSectionType(StringRef Name, SectionKind K) {
- if (strcmp(Name, ".init_array") == 0)
+ if (Name == ".init_array")
return MCSectionELF::SHT_INIT_ARRAY;
- if (strcmp(Name, ".fini_array") == 0)
+ if (Name == ".fini_array")
return MCSectionELF::SHT_FINI_ARRAY;
- if (strcmp(Name, ".preinit_array") == 0)
+ if (Name == ".preinit_array")
return MCSectionELF::SHT_PREINIT_ARRAY;
if (K.isBSS() || K.isThreadBSS())
@@ -577,10 +576,12 @@
// into a 'uniqued' section name, create and return the section now.
if (GV->isWeakForLinker()) {
const char *Prefix = getSectionPrefixForUniqueGlobal(Kind);
- std::string Name = Mang->makeNameProper(GV->getNameStr());
+ SmallString<128> Name;
+ Name.append(Prefix, Prefix+strlen(Prefix));
+ Mang->makeNameProper(Name, GV->getName());
- return getELFSection((Prefix+Name).c_str(),
- getELFSectionType((Prefix+Name).c_str(), Kind),
+ return getELFSection(Name.str(),
+ getELFSectionType(Name.str(), Kind),
getELFSectionFlags(Kind),
Kind);
}
@@ -983,7 +984,7 @@
const MCSection *TargetLoweringObjectFileCOFF::
-getCOFFSection(const char *Name, bool isDirective, SectionKind Kind) const {
+getCOFFSection(StringRef Name, bool isDirective, SectionKind Kind) const {
// Create the map if it doesn't already exist.
if (UniquingMap == 0)
UniquingMap = new MachOUniqueMapTy();
@@ -1078,8 +1079,9 @@
// into a 'uniqued' section name, create and return the section now.
if (GV->isWeakForLinker()) {
const char *Prefix = getCOFFSectionPrefixForUniqueGlobal(Kind);
- std::string Name = Mang->makeNameProper(GV->getNameStr());
- return getCOFFSection((Prefix+Name).c_str(), false, Kind);
+ SmallString<128> Name(Prefix, Prefix+strlen(Prefix));
+ Mang->makeNameProper(Name, GV->getNameStr());
+ return getCOFFSection(Name.str(), false, Kind);
}
if (Kind.isText())