Fix handling of relocation names, so that prefix mangling works.

src/IceGlobalInits.cpp

 //===- subzero/src/IceGlobalInits.cpp - Global declarations ---------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the notion of function declarations, global
@@ skipping 50 matching lines @@
                             llvm::CallingConv::ID CallingConv,
                             llvm::GlobalValue::LinkageTypes Linkage,
                             bool IsProto) {
   return Ctx->newFunctionDeclaration(&Signature, CallingConv, Linkage, IsProto);
 }
 
 void FunctionDeclaration::dumpType(Ostream &Stream) const {
   Stream << Signature;
 }
 
-void FunctionDeclaration::dump(Ostream &Stream) const {
+void FunctionDeclaration::dump(GlobalContext *Ctx, Ostream &Stream) const {
   if (IsProto)
     Stream << "declare ";
   ::dumpLinkage(Stream, Linkage);
   ::dumpCallingConv(Stream, CallingConv);
-  Stream << Signature.getReturnType() << " @" << Name << "(";
+  Stream << Signature.getReturnType() << " @"
+         << (Ctx ? Ctx->mangleName(Name) : Name) << "(";
   bool IsFirst = true;
   for (Type ArgTy : Signature.getArgList()) {
     if (IsFirst)
       IsFirst = false;
     else
       Stream << ", ";
     Stream << ArgTy;
   }
   Stream << ")";
 }
@@ skipping 17 matching lines @@
         IsFirst = false;
       } else {
         Stream << ", ";
       }
       Init->dumpType(Stream);
     }
     Stream << " }>";
   }
 }
 
-void VariableDeclaration::dump(Ostream &Stream) const {
-  Stream << "@" << Name << " = internal "
-         << (IsConstant ? "constant" : "global") << " ";
+void VariableDeclaration::dump(GlobalContext *Ctx, Ostream &Stream) const {
+  Stream << "@" << ((Ctx && !getSuppressMangling())
+                    ? Ctx->mangleName(Name) : Name) << " = ";
+  ::dumpLinkage(Stream, Linkage);
+  Stream << " " << (IsConstant ? "constant" : "global") << " ";
 
   // Add initializer.
   if (Initializers.size() == 1) {
     Initializers.front()->dump(Stream);
   } else {
     dumpType(Stream);
     Stream << " <{ ";
     bool IsFirst = true;
     for (Initializer *Init : Initializers) {
       if (IsFirst) {
         IsFirst = false;
       } else {
         Stream << ", ";
       }
-      Init->dump(Stream);
+      Init->dump(Ctx, Stream);
     }
     Stream << " }>";
   }
 
   // Add alignment.
   if (Alignment > 0)
     Stream << ", align " << Alignment;
   Stream << "\n";
 }
 
 void VariableDeclaration::Initializer::dumpType(Ostream &Stream) const {
   Stream << "[" << getNumBytes() << " x " << Ice::IceType_i8 << "]";
 }
 
-void VariableDeclaration::DataInitializer::dump(Ostream &Stream) const {
+void VariableDeclaration::DataInitializer::dump(
+    GlobalContext *, Ostream &Stream) const {
   dumpType(Stream);
   Stream << " c\"";
   // Code taken from PrintEscapedString() in AsmWriter.cpp.  Keep
   // the strings in the same format as the .ll file for practical
   // diffing.
   for (uint8_t C : Contents) {
     if (isprint(C) && C != '\\' && C != '"')
       Stream << C;
     else
       Stream << '\\' << hexdigit(C >> 4) << hexdigit(C & 0x0F);
   }
   Stream << "\"";
 }
 
-void VariableDeclaration::ZeroInitializer::dump(Ostream &Stream) const {
+void VariableDeclaration::ZeroInitializer::dump(
+    GlobalContext *, Ostream &Stream) const {
   dumpType(Stream);
   Stream << " zeroinitializer";
 }
 
 void VariableDeclaration::RelocInitializer::dumpType(Ostream &Stream) const {
   Stream << Ice::IceType_i32;
 }
 
-void VariableDeclaration::RelocInitializer::dump(Ostream &Stream) const {
+void VariableDeclaration::RelocInitializer::dump(
+    GlobalContext *Ctx, Ostream &Stream) const {
   if (Offset != 0) {
     dumpType(Stream);
     Stream << " add (";
   }
   dumpType(Stream);
   Stream << " ptrtoint (";
   Declaration->dumpType(Stream);
-  Stream << "* @" << Declaration->getName() << " to ";
+  Stream << "* @";
+  if (Ctx)
+    Stream << Ctx->mangleName(Declaration->getName());
+  else
+    Stream << Declaration->getName();
+  Stream << " to ";
   dumpType(Stream);
   Stream << ")";
   if (Offset != 0) {
     Stream << ", ";
     dumpType(Stream);
     Stream << " " << Offset << ")";
   }
 }
 
 } // end of namespace Ice