[llvm-commits] [llvm] r62088 - in /llvm/trunk: include/llvm/Support/Mangler.h lib/VMCore/Mangler.cpp

[Rafael Espindola]

Author: rafael
Date: Mon Jan 12 09:53:25 2009
New Revision: 62088

URL: http://llvm.org/viewvc/llvm-project?rev=62088&view=rev
Log:
Remove some dead code from the days  llvm had type planes.

There might be more dead code, but with llvm-gcc bootstrap broken on linux x86-64 it is had to test :-(


Modified:
    llvm/trunk/include/llvm/Support/Mangler.h
    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=62088&r1=62087&r2=62088&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Support/Mangler.h (original)
+++ llvm/trunk/include/llvm/Support/Mangler.h Mon Jan 12 09:53:25 2009
@@ -51,11 +51,6 @@
   DenseMap<const Type*, unsigned> TypeMap;
   unsigned TypeCounter;
 
-  /// This keeps track of which global values have had their names
-  /// mangled in the current module.
-  ///
-  SmallPtrSet<const GlobalValue*, 16> MangledGlobals;
-  
   /// AcceptableChars - This bitfield contains a one for each character that is
   /// allowed to be part of an unmangled name.
   unsigned AcceptableChars[256/32];

Modified: llvm/trunk/lib/VMCore/Mangler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Mangler.cpp?rev=62088&r1=62087&r2=62088&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Mangler.cpp (original)
+++ llvm/trunk/lib/VMCore/Mangler.cpp Mon Jan 12 09:53:25 2009
@@ -145,49 +145,13 @@
     unsigned TypeUniqueID = getTypeID(GV->getType());
     static unsigned GlobalID = 0;
     Name = "__unnamed_" + utostr(TypeUniqueID) + "_" + utostr(GlobalID++);
-  } else if (!MangledGlobals.count(GV)) {
-    Name = makeNameProper(GV->getName() + Suffix, Prefix);
   } else {
-    unsigned TypeUniqueID = getTypeID(GV->getType());
-    Name = "l" + utostr(TypeUniqueID) + "_" + makeNameProper(GV->getName());
+    Name = makeNameProper(GV->getName() + Suffix, Prefix);
   }
 
   return Name;
 }
 
-static void InsertName(GlobalValue *GV, StringMap<GlobalValue*> &Names,
-                       SmallPtrSet<const GlobalValue*, 16> &MangledGlobals) {
-  if (!GV->hasName())   // We must mangle unnamed globals.
-    return;
-
-  // Figure out if this is already used.
-  GlobalValue *&ExistingValue = Names[GV->getNameStart()];
-  if (!ExistingValue) {
-    ExistingValue = GV;
-    return;
-  }
-
-  // If GV is external but the existing one is static, mangle the existing one
-  if ((GV->hasExternalLinkage() || GV->hasDLLImportLinkage()) &&
-      !(ExistingValue->hasExternalLinkage()
-        || ExistingValue->hasDLLImportLinkage())) {
-    MangledGlobals.insert(ExistingValue);
-    ExistingValue = GV;
-  } 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 {
-    // Otherwise, mangle GV
-    MangledGlobals.insert(GV);
-  }
-}
-
-
 Mangler::Mangler(Module &M, const char *prefix)
   : Prefix(prefix), UseQuotes(false), PreserveAsmNames(false),
     Count(0), TypeCounter(0) {
@@ -205,13 +169,4 @@
   markCharAcceptable('_');
   markCharAcceptable('$');
   markCharAcceptable('.');
-    
-  // Calculate which global values have names that will collide when we throw
-  // away type information.
-  StringMap<GlobalValue*> Names;
-  for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-    InsertName(I, Names, MangledGlobals);
-  for (Module::global_iterator I = M.global_begin(), E = M.global_end();
-       I != E; ++I)
-    InsertName(I, Names, MangledGlobals);
 }