[llvm-branch-commits] [llvm-branch] r71034 - in /llvm/branches/Apple/Dib: include/llvm/Support/Mangler.h lib/VMCore/Mangler.cpp test/CodeGen/X86/private-2.ll
Bill Wendling
isanbard at gmail.com
Tue May 5 16:00:42 PDT 2009
Author: void
Date: Tue May 5 18:00:41 2009
New Revision: 71034
URL: http://llvm.org/viewvc/llvm-project?rev=71034&view=rev
Log:
--- Merging r71032 into '.':
A test/CodeGen/X86/private-2.ll
U include/llvm/Support/Mangler.h
U lib/VMCore/Mangler.cpp
Added:
llvm/branches/Apple/Dib/test/CodeGen/X86/private-2.ll
- copied unchanged from r71032, llvm/trunk/test/CodeGen/X86/private-2.ll
Modified:
llvm/branches/Apple/Dib/include/llvm/Support/Mangler.h
llvm/branches/Apple/Dib/lib/VMCore/Mangler.cpp
Modified: llvm/branches/Apple/Dib/include/llvm/Support/Mangler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/include/llvm/Support/Mangler.h?rev=71034&r1=71033&r2=71034&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/include/llvm/Support/Mangler.h (original)
+++ llvm/branches/Apple/Dib/include/llvm/Support/Mangler.h Tue May 5 18:00:41 2009
@@ -29,7 +29,10 @@
/// symbol is marked as not needing this prefix.
const char *Prefix;
+ /// PrivatePrefix - This string is emitted before each symbol with private
+ /// linkage.
const char *PrivatePrefix;
+
/// UseQuotes - If this is set, the target accepts global names in quotes,
/// e.g. "foo bar" is a legal name. This syntax is used instead of escaping
/// the space character. By default, this is false.
@@ -95,7 +98,8 @@
/// does this for you, so there's no point calling it on the result
/// from getValueName.
///
- std::string makeNameProper(const std::string &x, const char *Prefix = "");
+ std::string makeNameProper(const std::string &x, const char *Prefix = 0,
+ const char *PrivatePrefix = 0);
private:
/// getTypeID - Return a unique ID for the specified LLVM type.
Modified: llvm/branches/Apple/Dib/lib/VMCore/Mangler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/VMCore/Mangler.cpp?rev=71034&r1=71033&r2=71034&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/lib/VMCore/Mangler.cpp (original)
+++ llvm/branches/Apple/Dib/lib/VMCore/Mangler.cpp Tue May 5 18:00:41 2009
@@ -31,8 +31,8 @@
/// makeNameProper - We don't want identifier names non-C-identifier characters
/// in them, so mangle them as appropriate.
///
-std::string Mangler::makeNameProper(const std::string &X, const char *Prefix) {
- std::string Result;
+std::string Mangler::makeNameProper(const std::string &X, const char *Prefix,
+ const char *PrivatePrefix) {
if (X.empty()) return X; // Empty names are uniqued by the caller.
// If PreserveAsmNames is set, names with asm identifiers are not modified.
@@ -40,12 +40,15 @@
return X;
if (!UseQuotes) {
+ std::string Result;
+
// If X does not start with (char)1, add the prefix.
+ bool NeedPrefix = true;
std::string::const_iterator I = X.begin();
- if (*I != 1)
- Result = Prefix;
- else
+ if (*I == 1) {
+ NeedPrefix = false;
++I; // Skip over the marker.
+ }
// Mangle the first letter specially, don't allow numbers.
if (*I >= '0' && *I <= '9')
@@ -57,53 +60,71 @@
else
Result += *I;
}
- } else {
- bool NeedsQuotes = false;
-
- std::string::const_iterator I = X.begin();
- if (*I == 1)
- ++I; // Skip over the marker.
- // If the first character is a number, we need quotes.
- if (*I >= '0' && *I <= '9')
- NeedsQuotes = true;
-
- // Do an initial scan of the string, checking to see if we need quotes or
- // to escape a '"' or not.
- if (!NeedsQuotes)
- for (std::string::const_iterator E = X.end(); I != E; ++I)
- if (!isCharAcceptable(*I)) {
- NeedsQuotes = true;
- break;
- }
-
- // In the common case, we don't need quotes. Handle this quickly.
- if (!NeedsQuotes) {
- if (*X.begin() != 1)
- return Prefix+X;
- else
- return X.substr(1);
+ if (NeedPrefix) {
+ if (Prefix)
+ Result = Prefix + Result;
+ if (PrivatePrefix)
+ Result = PrivatePrefix + Result;
}
+ return Result;
+ }
+
+ bool NeedPrefix = true;
+ bool NeedQuotes = false;
+ std::string Result;
+ std::string::const_iterator I = X.begin();
+ if (*I == 1) {
+ NeedPrefix = false;
+ ++I; // Skip over the marker.
+ }
+
+ // If the first character is a number, we need quotes.
+ if (*I >= '0' && *I <= '9')
+ NeedQuotes = true;
+
+ // Do an initial scan of the string, checking to see if we need quotes or
+ // to escape a '"' or not.
+ if (!NeedQuotes)
+ for (std::string::const_iterator E = X.end(); I != E; ++I)
+ if (!isCharAcceptable(*I)) {
+ NeedQuotes = true;
+ break;
+ }
+
+ // In the common case, we don't need quotes. Handle this quickly.
+ if (!NeedQuotes) {
+ if (NeedPrefix) {
+ if (Prefix)
+ Result = Prefix + X;
+ else
+ Result = X;
+ if (PrivatePrefix)
+ Result = PrivatePrefix + Result;
+ return Result;
+ } else
+ return X.substr(1);
+ }
- // Otherwise, construct the string the expensive way.
- I = X.begin();
-
- // If X does not start with (char)1, add the prefix.
- if (*I != 1)
- Result = Prefix;
+ // Otherwise, construct the string the expensive way.
+ for (std::string::const_iterator E = X.end(); I != E; ++I) {
+ if (*I == '"')
+ Result += "_QQ_";
+ else if (*I == '\n')
+ Result += "_NL_";
else
- ++I; // Skip the marker if present.
-
- for (std::string::const_iterator E = X.end(); I != E; ++I) {
- if (*I == '"')
- Result += "_QQ_";
- else if (*I == '\n')
- Result += "_NL_";
- else
- Result += *I;
- }
- Result = '"' + Result + '"';
+ Result += *I;
+ }
+
+ if (NeedPrefix) {
+ if (Prefix)
+ Result = Prefix + X;
+ else
+ Result = X;
+ if (PrivatePrefix)
+ Result = PrivatePrefix + Result;
}
+ Result = '"' + Result + '"';
return Result;
}
@@ -146,13 +167,10 @@
static unsigned GlobalID = 0;
Name = "__unnamed_" + utostr(TypeUniqueID) + "_" + utostr(GlobalID++);
} else {
- Name = makeNameProper(GV->getName() + Suffix, Prefix);
- std::string prefix;
if (GV->hasPrivateLinkage())
- prefix = PrivatePrefix;
+ Name = makeNameProper(GV->getName() + Suffix, Prefix, PrivatePrefix);
else
- prefix = "";
- Name = prefix + Name;
+ Name = makeNameProper(GV->getName() + Suffix, Prefix);
}
return Name;
More information about the llvm-branch-commits
mailing list