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

crosstest/test_calling_conv_main.cpp

 //===- subzero/crosstest/test_calling_conv_main.cpp - Driver for tests ----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains the driver for cross testing the compatibility of
@@ skipping 27 matching lines @@
 // llc, pass arguments to the callee in the same way.  The Caller() and
 // Subzero_Caller() functions both call the same callee (which has been
 // compiled by llc).  The result in the global buffer is compared to
 // check that it is the same value after the calls by both callers.
 //
 // testCallee() runs the same kind of test, except that the functions
 // Callee() and Subzero_Callee() are being tested to ensure that both
 // functions receive arguments from the caller in the same way.  The
 // caller is compiled by llc.
 
-size_t ArgNum, Subzero_ArgNum;
-CalleePtrTy Callee, Subzero_Callee;
-char *Buf, *Subzero_Buf;
+size_t ArgNum;
+CalleePtrTy Callee;
+char *Buf;
 
 const static size_t BUF_SIZE = 16;
 
 std::string bufAsString(const char Buf[BUF_SIZE]) {
   std::ostringstream OS;
   for (size_t i = 0; i < BUF_SIZE; ++i) {
     if (i > 0)
       OS << " ";
     OS << (unsigned) Buf[i];
   }
@@ skipping 15 matching lines @@
   }                                                                            \
   ,
     TEST_FUNC_TABLE
 #undef X
   };
 
   const static size_t NumFuncs = sizeof(Funcs) / sizeof(*Funcs);
 
   for (size_t f = 0; f < NumFuncs; ++f) {
     char BufLlc[BUF_SIZE], BufSz[BUF_SIZE];
-    Callee = Subzero_Callee = Funcs[f].Callee;
+    Callee = Funcs[f].Callee;
 
     for (size_t i = 0; i < Funcs[f].Args; ++i) {
       memset(BufLlc, 0xff, sizeof(BufLlc));
       memset(BufSz, 0xff, sizeof(BufSz));
 
-      ArgNum = Subzero_ArgNum = i;
+      ArgNum = i;
 
       Buf = BufLlc;
       Funcs[f].Caller();
 
       Buf = BufSz;
       Funcs[f].Subzero_Caller();
 
       ++TotalTests;
       if (!memcmp(BufLlc, BufSz, sizeof(BufLlc))) {
         ++Passes;
@@ skipping 23 matching lines @@
   }                                                                            \
   ,
     TEST_FUNC_TABLE
 #undef X
   };
 
   const static size_t NumFuncs = sizeof(Funcs) / sizeof(*Funcs);
 
   for (size_t f = 0; f < NumFuncs; ++f) {
     char BufLlc[BUF_SIZE], BufSz[BUF_SIZE];
-    Buf = BufLlc;
-    Subzero_Buf = BufSz;
 
     for (size_t i = 0; i < Funcs[f].Args; ++i) {
       memset(BufLlc, 0xff, sizeof(BufLlc));
       memset(BufSz, 0xff, sizeof(BufSz));
 
-      ArgNum = Subzero_ArgNum = i;
+      ArgNum = i;
 
+      Buf = BufLlc;
       Callee = Funcs[f].Callee;
       Funcs[f].Caller();
 
+      Buf = BufSz;
       Callee = Funcs[f].Subzero_Callee;
       Funcs[f].Caller();
 
       ++TotalTests;
       if (!memcmp(BufLlc, BufSz, sizeof(BufLlc))) {
         ++Passes;
       } else {
         ++Failures;
         std::cout << "testCallee(Caller=" << Funcs[f].CallerName
                   << ", Callee=" << Funcs[f].CalleeName << ", ArgNum=" << ArgNum
@@ skipping 10 matching lines @@
   size_t Failures = 0;
 
   testCaller(TotalTests, Passes, Failures);
   testCallee(TotalTests, Passes, Failures);
 
   std::cout << "TotalTests=" << TotalTests << " Passes=" << Passes
             << " Failures=" << Failures << "\n";
 
   return Failures;
 }