diff options
| -rw-r--r-- | lib/VMCore/Mangler.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp index 5257ca13a0..f68959abe6 100644 --- a/lib/VMCore/Mangler.cpp +++ b/lib/VMCore/Mangler.cpp @@ -132,6 +132,11 @@ std::string Mangler::getValueName(const GlobalValue *GV) { // - Otherwise, mangling occurs if global collides with existing name. if (isa<Function>(GV) && cast<Function>(GV)->getIntrinsicID()) { Name = GV->getName(); // Is an intrinsic function + } else if (!GV->hasName()) { + // Must mangle the global into a unique ID. + unsigned TypeUniqueID = getTypeID(GV->getType()); + static unsigned GlobalID = 0; + Name = "__unnamed_" + utostr(TypeUniqueID) + "_" + utostr(GlobalID++); } else if (!MangledGlobals.count(GV)) { Name = makeNameProper(GV->getName(), Prefix); } else { @@ -144,10 +149,8 @@ std::string Mangler::getValueName(const GlobalValue *GV) { void Mangler::InsertName(GlobalValue *GV, std::map<std::string, GlobalValue*> &Names) { - if (!GV->hasName()) { // We must mangle unnamed globals. - MangledGlobals.insert(GV); + if (!GV->hasName()) // We must mangle unnamed globals. return; - } // Figure out if this is already used. GlobalValue *&ExistingValue = Names[GV->getName()]; |