llvm-nm: Observe -no-llvm-bc for archive members

[kastiglione]

Summary

This change fixes the -no-llvm-bc flag to work with object files within
archives. Currently the -no-llvm-bc flag works for regular object files, but
not static libraries, where it continues to show bitcode symbol info.

Original support was added in D4371.

[kastiglione]

Remove hardcoded bitcode from test

[kastiglione]

test/tools/llvm-nm/X86/archive-no-llvm-bc.test

1 ↗

(On Diff #153616)

Is it a bad practice to use a known file name at a relative path like this?

[kastiglione]

Fixup test

[kastiglione]

Use %t instead of %T

[compnerd]

test/tools/llvm-nm/X86/archive-no-llvm-bc.test

2 ↗

(On Diff #153646)

I dont understand this. Where is embedded.bc being used? It seems that you could completely remove this bit and still have the test work?

[smeenai]

test/tools/llvm-nm/X86/archive-no-llvm-bc.test

1 ↗

(On Diff #153646)

mkdir -p is probably better.

2 ↗

(On Diff #153646)

It's used in the incbin directive below (line 14).

[kastiglione]

test/tools/llvm-nm/X86/archive-no-llvm-bc.test

1 ↗

(On Diff #153646)

good call

2 ↗

(On Diff #153646)

@compnerd the IR in this test is used twice, once to generate bitcode, and a second time to generate an object file. As @smeenai pointed to, there are two module asm directives that embed the bitcode.

[compnerd]

Ah, I see. I think I had overlooked the .incbin.

[kastiglione]

Update lit setup

[kastiglione]

Fix accidentally changed llvm-nm test invocation

[kastiglione]

@smeenai or @compnerd – much late follow up, but either of you willing to accept?

[smeenai]

I'm not familiar enough with this part of the code to feel comfortable accepting, sorry.

[kastiglione]

@compnerd would you be willing to accept?

[kastiglione]

@pcc I have this fix related to -no-llvm-bc (D4371). I'm looking for a reviewer: could you review, or could you suggest someone? Thanks.

[compnerd]

@kastiglione - bleh, seems that this got lost. This seems like a good fix that we should get in.

[kastiglione]

Thanks @compnerd!

llvm/trunk/test/tools/llvm-nm/X86/archive-no-llvm-bc.test

+; RUN: rm -rf %t && mkdir -p %t
+; RUN: grep -v "module asm" %s | llvm-as -o %t/embedded.bc
+; RUN: llc -I=%t -filetype=obj -o %t/obj.o %s
+; RUN: llvm-ar crs %t/lib.a %t/obj.o
+; RUN: llvm-nm -m -no-llvm-bc %t/lib.a | FileCheck %s
+
+target triple = "x86_64-apple-macosx10.11"
+
+@q = global i32 1, align 4
+; CHECK-NOT: {{-+}} (LTO,DATA) external _q
+; CHECK: {{[[:xdigit:]]+}} (__DATA,__data) external _q
+
+module asm ".section __LLVM,__bitcode"
+module asm ".incbin \22embedded.bc\22"
+

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

 
 static void dumpSymbolNamesFromFile(std::string &Filename) {
   ErrorOr<std::unique_ptr<MemoryBuffer>> BufferOrErr =
       MemoryBuffer::getFileOrSTDIN(Filename);
   if (error(BufferOrErr.getError(), Filename))
     return;
 
   LLVMContext Context;
-  Expected<std::unique_ptr<Binary>> BinaryOrErr = createBinary(
-      BufferOrErr.get()->getMemBufferRef(), NoLLVMBitcode ? nullptr : &Context);
+  LLVMContext *ContextPtr = NoLLVMBitcode ? nullptr : &Context;
+  Expected<std::unique_ptr<Binary>> BinaryOrErr =
+      createBinary(BufferOrErr.get()->getMemBufferRef(), ContextPtr);
   if (!BinaryOrErr) {
     error(BinaryOrErr.takeError(), Filename);
     return;
   }
   Binary &Bin = *BinaryOrErr.get();
 
   if (Archive *A = dyn_cast<Archive>(&Bin)) {
     if (ArchiveMap) {
if (ArchiveMap) {
         }
         outs() << "\n";
       }
     }
 
     {
       Error Err = Error::success();
       for (auto &C : A->children(Err)) {
-        Expected<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(&Context);
+        Expected<std::unique_ptr<Binary>> ChildOrErr =
+            C.getAsBinary(ContextPtr);
         if (!ChildOrErr) {
           if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError()))
             error(std::move(E), Filename, C);
           continue;
         }
         if (SymbolicFile *O = dyn_cast<SymbolicFile>(&*ChildOrErr.get())) {
           if (!MachOPrintSizeWarning && PrintSize &&  isa<MachOObjectFile>(O)) {
             WithColor::warning(errs(), ToolName)
if (!ArchAll && !ArchFlags.empty()) {
                     StringRef(I->getArchFlagName()) : StringRef());
               continue;
             } else if (Expected<std::unique_ptr<Archive>> AOrErr =
                            I->getAsArchive()) {
               std::unique_ptr<Archive> &A = *AOrErr;
               Error Err = Error::success();
               for (auto &C : A->children(Err)) {
                 Expected<std::unique_ptr<Binary>> ChildOrErr =
-                    C.getAsBinary(&Context);
+                    C.getAsBinary(ContextPtr);
                 if (!ChildOrErr) {
                   if (auto E = isNotObjectErrorInvalidFileType(
                                        ChildOrErr.takeError())) {
                     error(std::move(E), Filename, C, ArchFlags.size() > 1 ?
                           StringRef(I->getArchFlagName()) : StringRef());
                   }
                   continue;
                 }
if (!ArchAll) {
             error(std::move(E), Filename);
             return;
           } else if (Expected<std::unique_ptr<Archive>> AOrErr =
                          I->getAsArchive()) {
             std::unique_ptr<Archive> &A = *AOrErr;
             Error Err = Error::success();
             for (auto &C : A->children(Err)) {
               Expected<std::unique_ptr<Binary>> ChildOrErr =
-                  C.getAsBinary(&Context);
+                  C.getAsBinary(ContextPtr);
               if (!ChildOrErr) {
                 if (auto E = isNotObjectErrorInvalidFileType(
                                      ChildOrErr.takeError()))
                   error(std::move(E), Filename, C);
                 continue;
               }
               if (SymbolicFile *O =
                       dyn_cast<SymbolicFile>(&*ChildOrErr.get())) {
for (MachOUniversalBinary::object_iterator I = UB->begin_objects(),
               StringRef(I->getArchFlagName()) : StringRef());
         continue;
       } else if (Expected<std::unique_ptr<Archive>> AOrErr =
                   I->getAsArchive()) {
         std::unique_ptr<Archive> &A = *AOrErr;
         Error Err = Error::success();
         for (auto &C : A->children(Err)) {
           Expected<std::unique_ptr<Binary>> ChildOrErr =
-            C.getAsBinary(&Context);
+            C.getAsBinary(ContextPtr);
           if (!ChildOrErr) {
             if (auto E = isNotObjectErrorInvalidFileType(
                                  ChildOrErr.takeError()))
               error(std::move(E), Filename, C, moreThanOneArch ?
                     StringRef(ArchitectureName) : StringRef());
             continue;
           }
           if (SymbolicFile *O = dyn_cast<SymbolicFile>(&*ChildOrErr.get())) {