Encode the conditional execution predicate when JITing.

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

diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp
index f68959abe64fbf5e43427545511ea587e63ca59f..d86d9c0da6c95ffd93c121d1823047d98107a194 100644 (file)
--- a/lib/VMCore/Mangler.cpp
+++ b/lib/VMCore/Mangler.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -14,7 +14,9 @@
 #include "llvm/Support/Mangler.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringMap.h"
 using namespace llvm;
 
 static char HexDigit(int V) {
@@ -33,6 +35,10 @@ std::string Mangler::makeNameProper(const std::string &X, const char *Prefix) {
   std::string Result;
   if (X.empty()) return X;  // Empty names are uniqued by the caller.
   
+  // If PreserveAsmNames is set, names with asm identifiers are not modified. 
+  if (PreserveAsmNames && X[0] == 1)
+    return X;
+  
   if (!UseQuotes) {
     // If X does not start with (char)1, add the prefix.
     std::string::const_iterator I = X.begin();
@@ -91,6 +97,8 @@ std::string Mangler::makeNameProper(const std::string &X, const char *Prefix) {
     for (std::string::const_iterator E = X.end(); I != E; ++I) {
       if (*I == '"')
         Result += "_QQ_";
+      else if (*I == '\n')
+        Result += "_NL_";
       else
         Result += *I;
     }
@@ -121,7 +129,7 @@ std::string Mangler::getValueName(const Value *V) {
 }
 
 
-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())
@@ -130,15 +138,15 @@ std::string Mangler::getValueName(const GlobalValue *GV) {
   // 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()) {
-    Name = GV->getName(); // Is an intrinsic function
+  if (isa<Function>(GV) && cast<Function>(GV)->isIntrinsic()) {
+    Name = GV->getNameStart(); // 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);
+    Name = makeNameProper(GV->getName() + Suffix, Prefix);
   } else {
     unsigned TypeUniqueID = getTypeID(GV->getType());
     Name = "l" + utostr(TypeUniqueID) + "_" + makeNameProper(GV->getName());
@@ -147,33 +155,43 @@ std::string Mangler::getValueName(const GlobalValue *GV) {
   return Name;
 }
 
-void Mangler::InsertName(GlobalValue *GV,
-                         std::map<std::string, GlobalValue*> &Names) {
+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->getName()];
+  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 {
-    // If GV is external but the existing one is static, mangle the existing one
-    if (GV->hasExternalLinkage() && !ExistingValue->hasExternalLinkage()) {
-      MangledGlobals.insert(ExistingValue);
-      ExistingValue = GV;
-    } else {
-      // Otherwise, mangle GV
-      MangledGlobals.insert(GV);
-    }
+    // Otherwise, mangle GV
+    MangledGlobals.insert(GV);
   }
 }
 
 
 Mangler::Mangler(Module &M, const char *prefix)
-  : Prefix(prefix), UseQuotes(false), Count(0), TypeCounter(0) {
-  std::fill(AcceptableChars, 
-          AcceptableChars+sizeof(AcceptableChars)/sizeof(AcceptableChars[0]),
-            0);
+  : Prefix(prefix), UseQuotes(false), PreserveAsmNames(false),
+    Count(0), TypeCounter(0) {
+  std::fill(AcceptableChars, array_endof(AcceptableChars), 0);
 
   // Letters and numbers are acceptable.
   for (unsigned char X = 'a'; X <= 'z'; ++X)
@@ -190,9 +208,10 @@ Mangler::Mangler(Module &M, const char *prefix)
     
   // Calculate which global values have names that will collide when we throw
   // away type information.
-  std::map<std::string, GlobalValue*> Names;
+  StringMap<GlobalValue*> Names;
   for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
-    InsertName(I, Names);
-  for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I)
-    InsertName(I, Names);
+    InsertName(I, Names, MangledGlobals);
+  for (Module::global_iterator I = M.global_begin(), E = M.global_end();
+       I != E; ++I)
+    InsertName(I, Names, MangledGlobals);
 }