Object: Add IRObjectFile::getTargetTriple().

[pcc]

Summary

This lets us remove a use of IRObjectFile::getModule() in llvm-nm.

Depends on D27073

[mehdi_amini]

LGTM.

llvm/tools/llvm-nm/llvm-nm.cpp

273

A bit more concise:

auto TripleStr = IRobj->getTargetTriple()
if (TripleStr.empty)
  return false;
return Triple(TripleStr).isArch64Bit();

Or even:

auto TripleStr = IRobj->getTargetTriple()
return !TripleStr.empty() && Triple(TripleStr).isArch64Bit();

[pcc]

llvm/tools/llvm-nm/llvm-nm.cpp

273

In fact we don't need to test TripleStr for emptiness because isArch64Bit will return false given an empty triple. So I committed an even shorter version.

llvm/include/llvm/Object/IRObjectFile.h

public:
   const Module &getModule() const {
     return const_cast<IRObjectFile*>(this)->getModule();
   }
   Module &getModule() {
     return *M;
   }
   std::unique_ptr<Module> takeModule();
 
+  StringRef getTargetTriple() const;
+
   static inline bool classof(const Binary *v) {
     return v->isIR();
   }
 
   /// \brief Finds and returns bitcode embedded in the given object file, or an
   /// error code if not found.
   static ErrorOr<MemoryBufferRef> findBitcodeInObject(const ObjectFile &Obj);
 

llvm/lib/Object/IRObjectFile.cpp

 
 basic_symbol_iterator IRObjectFile::symbol_end() const {
   DataRefImpl Ret;
   Ret.p = reinterpret_cast<uintptr_t>(SymTab.symbols().data() +
                                       SymTab.symbols().size());
   return basic_symbol_iterator(BasicSymbolRef(Ret, this));
 }
 
+StringRef IRObjectFile::getTargetTriple() const { return M->getTargetTriple(); }
+
 ErrorOr<MemoryBufferRef> IRObjectFile::findBitcodeInObject(const ObjectFile &Obj) {
   for (const SectionRef &Sec : Obj.sections()) {
     if (Sec.isBitcode()) {
       StringRef SecContents;
       if (std::error_code EC = Sec.getContents(SecContents))
         return EC;
       return MemoryBufferRef(SecContents, Obj.getFileName());
     }

llvm/tools/llvm-nm/llvm-nm.cpp

 static bool compareSymbolName(const NMSymbol &A, const NMSymbol &B) {
   return std::make_tuple(A.Name, A.Size, A.Address) <
          std::make_tuple(B.Name, B.Size, B.Address);
 }
 
 static char isSymbolList64Bit(SymbolicFile &Obj) {
   if (isa<IRObjectFile>(Obj)) {
     IRObjectFile *IRobj = dyn_cast<IRObjectFile>(&Obj);
-    Module &M = IRobj->getModule();
-    if (M.getTargetTriple().empty())
+    if (IRobj->getTargetTriple().empty())
       return false;
-    Triple T(M.getTargetTriple());
+    Triple T(IRobj->getTargetTriple());
     return T.isArch64Bit();
   }
   if (isa<COFFObjectFile>(Obj))
     return false;
   if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj))
     return MachO->is64Bit();
   return cast<ELFObjectFileBase>(Obj).getBytesInAddress() == 8;
 }