Rename Function::getEntryNode -> getEntryBlock

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

diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp
index 5bae6f04f67250063021418783afd118bfc25f94..d9186a9c938f9777ce3070089cc24ecd6a348a58 100644 (file)
--- a/lib/VMCore/Mangler.cpp
+++ b/lib/VMCore/Mangler.cpp
@@ -4,30 +4,38 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <iostream>
-#include <set>
-#include <string>
-#include "llvm/Value.h"
+#include "llvm/Support/Mangler.h"
 #include "llvm/Module.h"
 #include "llvm/Type.h"
 #include "Support/StringExtras.h"
-#include "llvm/Support/Mangler.h"
 
-/// makeNameProper - We don't want identifier names with ., space, or
-/// - in them, so we mangle these characters into the strings "d_",
-/// "s_", and "D_", respectively.
+static char HexDigit(int V) {
+  return V < 10 ? V+'0' : V+'A'-10;
+}
+
+static std::string MangleLetter(unsigned char C) {
+  return std::string("_")+HexDigit(C >> 4) + HexDigit(C & 15) + "_";
+}
+
+/// 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) {
-  std::string tmp;
-  for (std::string::const_iterator sI = x.begin(), sEnd = x.end();
-       sI != sEnd; sI++)
-    switch (*sI) {
-    case '.': tmp += "d_"; break;
-    case ' ': tmp += "s_"; break;
-    case '-': tmp += "D_"; break;
-    default:  tmp += *sI;
-    }
-  return tmp;
+std::string Mangler::makeNameProper(const std::string &X) {
+  std::string Result;
+  
+  // Mangle the first letter specially, don't allow numbers...
+  if ((X[0] < 'a' || X[0] > 'z') && (X[0] < 'A' || X[0] > 'Z') && X[0] != '_')
+    Result += MangleLetter(X[0]);
+  else
+    Result += X[0];
+
+  for (std::string::const_iterator I = X.begin()+1, E = X.end(); I != E; ++I)
+    if ((*I < 'a' || *I > 'z') && (*I < 'A' || *I > 'Z') &&
+        (*I < '0' || *I > '9') && *I != '_')
+      Result += MangleLetter(*I);
+    else
+      Result += *I;
+  return Result;
 }
 
 std::string Mangler::getValueName(const Value *V) {
@@ -46,8 +54,9 @@ std::string Mangler::getValueName(const Value *V) {
     //   2) V's name would collide if it is not mangled.
     //
     const GlobalValue* gv = dyn_cast<GlobalValue>(V);
-    if(gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
+    if (gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
       name = makeNameProper(gv->getName());
+      if (AddUnderscorePrefix) name = "_" + name;
     } else {
       // Non-global, or global with internal linkage / colliding name
       // -> mangle.
@@ -58,12 +67,13 @@ std::string Mangler::getValueName(const Value *V) {
     name = "ltmp_" + utostr(Count++) + "_"
       + utostr(V->getType()->getUniqueID());
   }
+  
   Memo[V] = name;
   return name;
 }
 
-Mangler::Mangler(Module &M_) : M(M_)
-{
+Mangler::Mangler(Module &m, bool addUnderscorePrefix)
+  : M(m), AddUnderscorePrefix(addUnderscorePrefix) {
   // Calculate which global values have names that will collide when we throw
   // away type information.
   std::set<std::string> FoundNames;