#include "llvm/Support/Mangler.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Module.h"
+#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringExtras.h"
using namespace llvm;
}
-std::string Mangler::getValueName(const GlobalValue *GV) {
+std::string Mangler::getValueName(const GlobalValue *GV, const char * Suffix) {
// Check to see whether we've already named V.
std::string &Name = Memo[GV];
if (!Name.empty())
// Name mangling occurs as follows:
// - If V is an intrinsic function, do not change name at all
// - Otherwise, mangling occurs if global collides with existing name.
- if (isa<Function>(GV) && cast<Function>(GV)->getIntrinsicID()) {
+ if (isa<Function>(GV) && cast<Function>(GV)->isIntrinsic()) {
Name = GV->getName(); // Is an intrinsic function
} else if (!GV->hasName()) {
// Must mangle the global into a unique ID.
static unsigned GlobalID = 0;
Name = "__unnamed_" + utostr(TypeUniqueID) + "_" + utostr(GlobalID++);
} else if (!MangledGlobals.count(GV)) {
- Name = makeNameProper(GV->getName(), Prefix);
+ Name = makeNameProper(GV->getName() + Suffix, Prefix);
} else {
unsigned TypeUniqueID = getTypeID(GV->getType());
Name = "l" + utostr(TypeUniqueID) + "_" + makeNameProper(GV->getName());
ExistingValue = GV;
} else {
// If GV is external but the existing one is static, mangle the existing one
- if (GV->hasExternalLinkage() && !ExistingValue->hasExternalLinkage()) {
+ if ((GV->hasExternalLinkage() || GV->hasDLLImportLinkage()) &&
+ !(ExistingValue->hasExternalLinkage() || ExistingValue->hasDLLImportLinkage())) {
MangledGlobals.insert(ExistingValue);
ExistingValue = GV;
- } else if (GV->hasExternalLinkage() && ExistingValue->hasExternalLinkage()&&
- GV->isExternal() && ExistingValue->isExternal()) {
+ } else if ((GV->hasExternalLinkage() ||
+ GV->hasDLLImportLinkage()) &&
+ (ExistingValue->hasExternalLinkage() ||
+ ExistingValue->hasDLLImportLinkage()) &&
+ GV->isDeclaration() &&
+ ExistingValue->isDeclaration()) {
// If the two globals both have external inkage, and are both external,
// don't mangle either of them, we just have some silly type mismatch.
} else {
Mangler::Mangler(Module &M, const char *prefix)
: Prefix(prefix), UseQuotes(false), PreserveAsmNames(false),
Count(0), TypeCounter(0) {
- std::fill(AcceptableChars,
- AcceptableChars+sizeof(AcceptableChars)/sizeof(AcceptableChars[0]),
- 0);
+ std::fill(AcceptableChars, array_endof(AcceptableChars), 0);
// Letters and numbers are acceptable.
for (unsigned char X = 'a'; X <= 'z'; ++X)