Make llvm-tli-checker support static libraries

[probinson]

Summary

The original implementation assumed dynamic libraries and so looked
only at the dynamic symbol table. Use the regular symbol table for
ET_REL files.

[rengolin]

A few nits, but looks good to me, thanks!

llvm/tools/llvm-tli-checker/llvm-tli-checker.cpp

167

Nit:

// Insert defined global function symbols into the map if valid.

168

Feels weird to pass the end() iterator here, because in theory you could pass any valid iterator and it wouldn't be the same logic.

I think passing a reference to the object and then using Section != o.section_end() would be more clear as well as avoiding improper use by accident.

176

Nit: I'd wrap this in curly brackets because of the two-line if statement.

[probinson]

Address review comments.

[probinson]

llvm/tools/llvm-tli-checker/llvm-tli-checker.cpp

168

Yeah, passing the ObjectFile does help avoid mistakes.

176

OK. And that lets me sink the getName() inside the if as well.

[rengolin]

LGTM, thanks!

llvm/test/tools/llvm-tli-checker/ps4-tli-check.yaml

 # REQUIRES: x86-registered-target
 #
-## This produces the object that matches expectations for PS4/PS5.
-# RUN: yaml2obj %s -DZDAPV=_ZdaPv -o=%t1
+## This produces a static object that matches expectations for PS4/PS5.
+# RUN: yaml2obj %s -DTYPE=ET_REL -DLABEL=Symbols -DZDAPV=_ZdaPv -o=%t1
 # RUN: llvm-tli-checker --triple=x86_64-scei-ps4 %t1 | FileCheck %s
 # RUN: llvm-tli-checker --triple=x86_64-sie-ps5 %t1 | FileCheck %s
 #
-## This produces an object that has _ZdaPvj instead of _ZdaPv.
-# RUN: yaml2obj %s -DZDAPV=_ZdaPvj -o=%t2
+## This produces a dynamic object that has _ZdaPvj instead of _ZdaPv.
+# RUN: yaml2obj %s -DTYPE=ET_DYN -DLABEL=DynamicSymbols -DZDAPV=_ZdaPvj -o=%t2
 # RUN: llvm-tli-checker --triple x86_64-scei-ps4 %t2 | \
 # RUN:     FileCheck %s --check-prefixes=WRONG_SUMMARY,WRONG_DETAIL \
 # RUN:    --implicit-check-not="==" --implicit-check-not="<<" --implicit-check-not=">>"
 #
 ## --report=discrepancy is the default, check we get the same output.
 # RUN: llvm-tli-checker --triple x86_64-scei-ps4 %t2 --report=discrepancy | \
 # RUN:     FileCheck %s --check-prefixes=WRONG_SUMMARY,WRONG_DETAIL \
 # RUN:    --implicit-check-not="==" --implicit-check-not="<<" --implicit-check-not=">>"

llvm/tools/llvm-tli-checker/llvm-tli-checker.cpp

for (auto &TLIName : TLINames) {
     outs() << (TLIName.second ? "    " : "not ")
            << "available: " << getPrintableName(TLIName.first) << '\n';
   }
 }
 
 // Store all the exported symbol names we found in the input libraries.
 // We use a map to get hashed lookup speed; the bool is meaningless.
 class SDKNameMap : public StringMap<bool> {
+  void maybeInsertSymbol(const SymbolRef &S, const ObjectFile &O);
   void populateFromObject(ObjectFile *O);
   void populateFromArchive(Archive *A);
 
 public:
   void populateFromFile(StringRef LibDir, StringRef LibName);
 };
 static SDKNameMap SDKNames;
 
+// Insert defined global function symbols into the map if valid.
+void SDKNameMap::maybeInsertSymbol(const SymbolRef &S, const ObjectFile &O) {
+  SymbolRef::Type Type = unwrapIgnoreError(S.getType());
+  uint32_t Flags = unwrapIgnoreError(S.getFlags());
+  section_iterator Section = unwrapIgnoreError(S.getSection(),
+                                               /*Default=*/O.section_end());
+  if (Type == SymbolRef::ST_Function && (Flags & SymbolRef::SF_Global) &&
+      Section != O.section_end()) {
+    StringRef Name = unwrapIgnoreError(S.getName());
+    insert({ Name, true });
+  }
+}
+
 // Given an ObjectFile, extract the global function symbols.
 void SDKNameMap::populateFromObject(ObjectFile *O) {
   // FIXME: Support other formats.
   if (!O->isELF()) {
     WithColor::warning() << O->getFileName()
                          << ": only ELF-format files are supported\n";
     return;
   }
   const auto *ELF = cast<ELFObjectFileBase>(O);
 
-  for (const auto &S : ELF->getDynamicSymbolIterators()) {
-    // We want only defined global function symbols.
-    SymbolRef::Type Type = unwrapIgnoreError(S.getType());
-    uint32_t Flags = unwrapIgnoreError(S.getFlags());
-    section_iterator Section = unwrapIgnoreError(S.getSection(),
-                                                 /*Default=*/O->section_end());
-    StringRef Name = unwrapIgnoreError(S.getName());
-    if (Type == SymbolRef::ST_Function && (Flags & SymbolRef::SF_Global) &&
-        Section != O->section_end())
-      insert({Name, true});
+  if (ELF->getEType() == ELF::ET_REL) {
+    for (const auto &S : ELF->symbols())
+      maybeInsertSymbol(S, *O);
+  } else {
+    for (const auto &S : ELF->getDynamicSymbolIterators())
+      maybeInsertSymbol(S, *O);
   }
 }
 
 // Unpack an archive and populate from the component object files.
 // This roughly imitates dumpArchive() from llvm-objdump.cpp.
 void SDKNameMap::populateFromArchive(Archive *A) {
   Error Err = Error::success();
   int Index = -1;