[ELF][mips] Print the full file path for files with incompatible ISA

[arichardson]

Summary

I also changed the message to print both the ISA and the the architecture
name for incompatible files. Previously it would be quite hard to find the
actual path of the incompatible object files in projects that have many
object files with the same name in different directories.

[arichardson]

Run git-clang-format

[atanasyan]

LGTM. Thanks!

ELF/Arch/MipsArchTree.cpp

 
 namespace {
 struct ArchTreeEdge {
   uint32_t Child;
   uint32_t Parent;
 };
 
 struct FileFlags {
-  StringRef Filename;
+  InputFile *File;
   uint32_t Flags;
 };
 } // namespace
 
 static StringRef getAbiName(uint32_t Flags) {
   switch (Flags) {
   case 0:
     return "n64";
static void checkFlags(ArrayRef<FileFlags> Files) {
   uint32_t ABI = Files[0].Flags & (EF_MIPS_ABI | EF_MIPS_ABI2);
   bool Nan = Files[0].Flags & EF_MIPS_NAN2008;
   bool Fp = Files[0].Flags & EF_MIPS_FP64;
 
   for (const FileFlags &F : Files.slice(1)) {
     uint32_t ABI2 = F.Flags & (EF_MIPS_ABI | EF_MIPS_ABI2);
     if (ABI != ABI2)
       error("target ABI '" + getAbiName(ABI) + "' is incompatible with '" +
-            getAbiName(ABI2) + "': " + F.Filename);
+            getAbiName(ABI2) + "': " + toString(F.File));
 
     bool Nan2 = F.Flags & EF_MIPS_NAN2008;
     if (Nan != Nan2)
       error("target -mnan=" + getNanName(Nan) + " is incompatible with -mnan=" +
-            getNanName(Nan2) + ": " + F.Filename);
+            getNanName(Nan2) + ": " + toString(F.File));
 
     bool Fp2 = F.Flags & EF_MIPS_FP64;
     if (Fp != Fp2)
       error("target -mfp" + getFpName(Fp) + " is incompatible with -mfp" +
-            getFpName(Fp2) + ": " + F.Filename);
+            getFpName(Fp2) + ": " + toString(F.File));
   }
 }
 
 static uint32_t getMiscFlags(ArrayRef<FileFlags> Files) {
   uint32_t Ret = 0;
   for (const FileFlags &F : Files)
     Ret |= F.Flags &
            (EF_MIPS_ABI | EF_MIPS_ABI2 | EF_MIPS_ARCH_ASE | EF_MIPS_NOREORDER |
             EF_MIPS_MICROMIPS | EF_MIPS_NAN2008 | EF_MIPS_32BITMODE);
   return Ret;
 }
 
 static uint32_t getPicFlags(ArrayRef<FileFlags> Files) {
   // Check PIC/non-PIC compatibility.
   bool IsPic = Files[0].Flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
   for (const FileFlags &F : Files.slice(1)) {
     bool IsPic2 = F.Flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
     if (IsPic && !IsPic2)
-      warn("linking abicalls code with non-abicalls file: " + F.Filename);
+      warn("linking abicalls code " + toString(Files[0].File) +
+           " with non-abicalls file: " + toString(F.File));
     if (!IsPic && IsPic2)
-      warn("linking non-abicalls code with abicalls file: " + F.Filename);
+      warn("linking non-abicalls code " + toString(Files[0].File) +
+           " with abicalls file: " + toString(F.File));
   }
 
   // Compute the result PIC/non-PIC flag.
   uint32_t Ret = Files[0].Flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
   for (const FileFlags &F : Files.slice(1))
     Ret &= F.Flags & (EF_MIPS_PIC | EF_MIPS_CPIC);
 
   // PIC code is inherently CPIC and may not set CPIC flag explicitly.
static StringRef getMachName(uint32_t Flags) {
   case EF_MIPS_MACH_XLR:
     return "xlr";
   default:
     return "unknown machine";
   }
 }
 
 static StringRef getArchName(uint32_t Flags) {
-  StringRef S = getMachName(Flags);
-  if (!S.empty())
-    return S;
-
   switch (Flags & EF_MIPS_ARCH) {
   case EF_MIPS_ARCH_1:
     return "mips1";
   case EF_MIPS_ARCH_2:
     return "mips2";
   case EF_MIPS_ARCH_3:
     return "mips3";
   case EF_MIPS_ARCH_4:
case EF_MIPS_ARCH_32R6:
     return "mips32r6";
   case EF_MIPS_ARCH_64R6:
     return "mips64r6";
   default:
     return "unknown arch";
   }
 }
 
+static std::string getFullArchName(uint32_t Flags) {
+  StringRef Arch = getArchName(Flags);
+  StringRef Mach = getMachName(Flags);
+  if (Mach.empty())
+    return Arch.str();
+  return (Arch + " (" + Mach + ")").str();
+}
+
 // There are (arguably too) many MIPS ISAs out there. Their relationships
 // can be represented as a forest. If all input files have ISAs which
 // reachable by repeated proceeding from the single child to the parent,
 // these input files are compatible. In that case we need to return "highest"
 // ISA. If there are incompatible input files, we show an error.
 // For example, mips1 is a "parent" of mips2 and such files are compatible.
 // Output file gets EF_MIPS_ARCH_2 flag. From the other side mips3 and mips32
 // are incompatible because nor mips3 is a parent for misp32, nor mips32
 // is a parent for mips3.
 static uint32_t getArchFlags(ArrayRef<FileFlags> Files) {
   uint32_t Ret = Files[0].Flags & (EF_MIPS_ARCH | EF_MIPS_MACH);
 
   for (const FileFlags &F : Files.slice(1)) {
     uint32_t New = F.Flags & (EF_MIPS_ARCH | EF_MIPS_MACH);
 
     // Check ISA compatibility.
     if (isArchMatched(New, Ret))
       continue;
     if (!isArchMatched(Ret, New)) {
-      error("target ISA '" + getArchName(Ret) + "' is incompatible with '" +
-            getArchName(New) + "': " + F.Filename);
+      error("incompatible target ISA:\n>>> " + toString(Files[0].File) + ": " +
+            getFullArchName(Ret) + "\n>>> " + toString(F.File) + ": " +
+            getFullArchName(New));
       return 0;
     }
     Ret = New;
   }
   return Ret;
 }
 
 template <class ELFT> uint32_t elf::calcMipsEFlags() {
   std::vector<FileFlags> V;
   for (InputFile *F : ObjectFiles)
-    V.push_back(
-        {F->getName(), cast<ObjFile<ELFT>>(F)->getObj().getHeader()->e_flags});
+    V.push_back({F, cast<ObjFile<ELFT>>(F)->getObj().getHeader()->e_flags});
   if (V.empty())
     return 0;
   checkFlags(V);
   return getMiscFlags(V) | getPicFlags(V) | getArchFlags(V);
 }
 
 static int compareMipsFpAbi(uint8_t FpA, uint8_t FpB) {
   if (FpA == FpB)

test/ELF/mips-elf-flags-err.s

__start:
   nop
 
 # R1R2:      Flags [
 # R1R2-NEXT:   EF_MIPS_ABI_O32
 # R1R2-NEXT:   EF_MIPS_ARCH_32R2
 # R1R2-NEXT:   EF_MIPS_CPIC
 # R1R2-NEXT: ]
 
-# R3R32: target ISA 'mips3' is incompatible with 'mips32': {{.*}}mips-elf-flags-err.s.tmp2.o
-# R6OCTEON: target ISA 'mips64r6' is incompatible with 'octeon': {{.*}}mips-elf-flags-err.s.tmp2.o
+# R3R32:      error: incompatible target ISA:
+# R3R32-NEXT: >>> {{.+}}/mips-elf-flags-err.s.tmp1.o: mips3
+# R3R32-NEXT: >>> {{.+}}/mips-elf-flags-err.s.tmp2.o: mips32
+
+# R6OCTEON:      error: incompatible target ISA:
+# R6OCTEON-NEXT: >>> {{.+}}/mips-elf-flags-err.s.tmp1.o: mips64r6
+# R6OCTEON-NEXT: >>> {{.+}}/mips-elf-flags-err.s.tmp2.o: mips64r2 (octeon)
+
 # FPABI: target floating point ABI '-mdouble-float' is incompatible with '-mgp32 -mfp64': {{.*}}mips-elf-flags-err.s.tmp2.o
 
 # OCTEON:      Flags [
 # OCTEON-NEXT:   EF_MIPS_ARCH_64R2
 # OCTEON-NEXT:   EF_MIPS_CPIC
 # OCTEON-NEXT:   EF_MIPS_MACH_OCTEON
 # OCTEON:      ]
 
 # N32O32: error: {{.*}}mips-elf-flags-err.s.tmp2.o is incompatible with {{.*}}mips-elf-flags-err.s.tmp1.o
 
 # NAN: target -mnan=2008 is incompatible with -mnan=legacy: {{.*}}mips-elf-flags-err.s.tmp2.o