Protect the GC table in Function.cpp

[oota-llvm.git] / lib / VMCore / Mangler.cpp

diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp
index 36cfbf766a796a15f1e87824b7adb393539b282d..1a68b890542f6fde732df09e93be7925fcccb922 100644 (file)
--- a/lib/VMCore/Mangler.cpp
+++ b/lib/VMCore/Mangler.cpp
@@ -14,6 +14,7 @@
 #include "llvm/Support/Mangler.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
+#include "llvm/System/Atomic.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringMap.h"
@@ -31,8 +32,8 @@ static std::string MangleLetter(unsigned char C) {
 /// 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 +41,15 @@ std::string Mangler::makeNameProper(const std::string &X, const char *Prefix) {
     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 +61,71 @@ std::string Mangler::makeNameProper(const std::string &X, const char *Prefix) {
       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;
+    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 (!NeedsQuotes)
-      for (std::string::const_iterator E = X.end(); I != E; ++I)
-        if (!isCharAcceptable(*I)) {
-          NeedsQuotes = true;
-          break;
-        }
+  // 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 (!NeedsQuotes) {
-      if (*X.begin() != 1)
-        return Prefix+X;
+  // In the common case, we don't need quotes.  Handle this quickly.
+  if (!NeedQuotes) {
+    if (NeedPrefix) {
+      if (Prefix)
+        Result = Prefix + X;
       else
-        return X.substr(1);
-    }
-    
-    // Otherwise, construct the string the expensive way.
-    I = X.begin();
+        Result = X;
+      if (PrivatePrefix)
+        Result = PrivatePrefix + Result;
+      return Result;
+    } else
+      return X.substr(1);
+  }
     
-    // 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;
 }
 
@@ -143,16 +165,17 @@ std::string Mangler::getValueName(const GlobalValue *GV, const char * Suffix) {
   } 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++);
+    static uint32_t GlobalID = 0;
+    
+    unsigned OldID = GlobalID;
+    sys::AtomicIncrement(&GlobalID);
+    
+    Name = "__unnamed_" + utostr(TypeUniqueID) + "_" + utostr(OldID);
   } 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;