[llvm-commits] [llvm] r76456 - in /llvm/trunk: include/llvm/Support/Mangler.h lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp lib/VMCore/Mangler.cpp
Bill Wendling
isanbard at gmail.com
Mon Jul 20 12:41:27 PDT 2009
Author: void
Date: Mon Jul 20 14:41:27 2009
New Revision: 76456
URL: http://llvm.org/viewvc/llvm-project?rev=76456&view=rev
Log:
Rename Mangler linkage enums to something less gross.
Modified:
llvm/trunk/include/llvm/Support/Mangler.h
llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
llvm/trunk/lib/VMCore/Mangler.cpp
Modified: llvm/trunk/include/llvm/Support/Mangler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Mangler.h?rev=76456&r1=76455&r2=76456&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Mangler.h (original)
+++ llvm/trunk/include/llvm/Support/Mangler.h Mon Jul 20 14:41:27 2009
@@ -27,9 +27,9 @@
class Mangler {
public:
enum ManglerPrefixTy {
- DefaultPrefixTy, ///< Emit default string before each symbol.
- PrivatePrefixTy, ///< Emit "private" prefix before each symbol.
- LinkerPrivatePrefixTy ///< Emit "linker private" prefix before each symbol.
+ Default, ///< Emit default string before each symbol.
+ Private, ///< Emit "private" prefix before each symbol.
+ LinkerPrivate ///< Emit "linker private" prefix before each symbol.
};
private:
@@ -103,7 +103,7 @@
/// from getValueName.
///
std::string makeNameProper(const std::string &x,
- ManglerPrefixTy PrefixTy = DefaultPrefixTy);
+ ManglerPrefixTy PrefixTy = Mangler::Default);
};
} // End llvm namespace
Modified: llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp?rev=76456&r1=76455&r2=76456&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp Mon Jul 20 14:41:27 2009
@@ -93,14 +93,10 @@
void Init(const std::string &GV, Mangler *Mang) {
// Already initialized.
if (!Stub.empty()) return;
- Stub = Mang->makeNameProper(GV + "$stub",
- Mangler::PrivatePrefixTy);
- LazyPtr = Mang->makeNameProper(GV + "$lazy_ptr",
- Mangler::PrivatePrefixTy);
- SLP = Mang->makeNameProper(GV + "$slp",
- Mangler::PrivatePrefixTy);
- SCV = Mang->makeNameProper(GV + "$scv",
- Mangler::PrivatePrefixTy);
+ Stub = Mang->makeNameProper(GV + "$stub", Mangler::Private);
+ LazyPtr = Mang->makeNameProper(GV + "$lazy_ptr", Mangler::Private);
+ SLP = Mang->makeNameProper(GV + "$slp", Mangler::Private);
+ SCV = Mang->makeNameProper(GV + "$scv", Mangler::Private);
}
};
Modified: llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp?rev=76456&r1=76455&r2=76456&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp Mon Jul 20 14:41:27 2009
@@ -71,11 +71,11 @@
// Already initialized.
if (!Stub.empty()) return;
Stub = Mang->makeNameProper(GV + "$stub",
- Mangler::PrivatePrefixTy);
+ Mangler::Private);
LazyPtr = Mang->makeNameProper(GV + "$lazy_ptr",
- Mangler::PrivatePrefixTy);
+ Mangler::Private);
AnonSymbol = Mang->makeNameProper(GV + "$stub$tmp",
- Mangler::PrivatePrefixTy);
+ Mangler::Private);
}
};
Modified: llvm/trunk/lib/VMCore/Mangler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Mangler.cpp?rev=76456&r1=76455&r2=76456&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Mangler.cpp (original)
+++ llvm/trunk/lib/VMCore/Mangler.cpp Mon Jul 20 14:41:27 2009
@@ -60,9 +60,9 @@
if (NeedPrefix) {
Result = Prefix + Result;
- if (PrefixTy == PrivatePrefixTy)
+ if (PrefixTy == Mangler::Private)
Result = PrivatePrefix + Result;
- else if (PrefixTy == LinkerPrivatePrefixTy)
+ else if (PrefixTy == Mangler::LinkerPrivate)
Result = LinkerPrivatePrefix + Result;
}
@@ -98,9 +98,9 @@
Result = Prefix + X;
- if (PrefixTy == PrivatePrefixTy)
+ if (PrefixTy == Mangler::Private)
Result = PrivatePrefix + Result;
- else if (PrefixTy == LinkerPrivatePrefixTy)
+ else if (PrefixTy == Mangler::LinkerPrivate)
Result = LinkerPrivatePrefix + Result;
return Result;
@@ -121,9 +121,9 @@
if (NeedPrefix) {
Result = Prefix + Result;
- if (PrefixTy == PrivatePrefixTy)
+ if (PrefixTy == Mangler::Private)
Result = PrivatePrefix + Result;
- else if (PrefixTy == LinkerPrivatePrefixTy)
+ else if (PrefixTy == Mangler::LinkerPrivate)
Result = LinkerPrivatePrefix + Result;
}
@@ -142,8 +142,8 @@
"Intrinsic functions cannot be mangled by Mangler");
ManglerPrefixTy PrefixTy =
- (GV->hasPrivateLinkage() || ForcePrivate) ? PrivatePrefixTy :
- GV->hasLinkerPrivateLinkage() ? LinkerPrivatePrefixTy : DefaultPrefixTy;
+ (GV->hasPrivateLinkage() || ForcePrivate) ? Mangler::Private :
+ GV->hasLinkerPrivateLinkage() ? Mangler::LinkerPrivate : Mangler::Default;
if (GV->hasName())
return makeNameProper(GV->getName() + Suffix, PrefixTy);
More information about the llvm-commits
mailing list