[llvm-size] Fix missing file name for darwin output format with non-Mach-O

[xgupta]

Summary

llvm-size falls back to printing in Berkeley format, if --format=darwin is specified and a non-Mach-O object has been provided. However, it does not print the input filename when it should:

Before -
(base) xgupta@archlinux ~/llvm/llvm-project/build (main*) $ llvm-size ~/hello.o --format=darwin

text	   data	    bss	    dec	    hex	filename
 291	      0	      0	    291	    123	%

After -
(base) xgupta@archlinux ~/llvm/llvm-project/build (main*) $ bin/llvm-size ~/hello.o --format=darwin

text	   data	    bss	    dec	    hex	filename
 291	      0	      0	    291	    123	/home/xgupta/hello.o

Fix #42316

[jhenderson]

Thanks for the patch @xgupta. Please could you write a new test (or update an existing one) in the lit testsuite at llvm\test\tools\llvm-size, to make sure this fix is covered by a test.

llvm/tools/llvm-size/llvm-size.cpp

512–513

I'm not sure this is the right place for this patch. The filenames are usually printed elsewhere, at the call site.

[xgupta]

Address comment and update test case

[jhenderson]

There are several other call sites to printObjectSectionSizes in llvm-size. At least one of those (to do with printing archive members) needs updating too (and a corresponding test added). There may be others too, but I think most of the other call sites would result in darwin format printing, since they are for handling Mach-O files or variations thereof. However, you should check.

llvm/test/tools/llvm-size/elf-m.test

9 ↗

(On Diff #455555)

It might be worth adding {{$}} to the end of this line. This will prevent FileCheck from matching successfully, if there's garbage after the filename.

[xgupta]

Address comment for printing archive statistics

[jhenderson]

Looks good to me, thanks! Do you have commit access?

[xgupta]

In D132364#3757698, @jhenderson wrote:

Looks good to me, thanks! Do you have commit access?

Thank you very much for the review. I do have commit access. I will run check-llvm and then commit it.

llvm/tools/llvm-size/llvm-size.cpp

else if (OutputFormat == sysv) {
     fmt << "%#7" << radix_fmt << "\t"
         << "%#7" << radix_fmt << "\t"
         << "%#7" << radix_fmt << "\t";
     outs() << format(fmt.str().c_str(), total_text, total_data, total_bss);
     fmtbuf.clear();
     fmt << "%7" << (Radix == octal ? PRIo64 : PRIu64) << "\t"
         << "%7" PRIx64 "\t";
     outs() << format(fmt.str().c_str(), total, total);
+
+    if (!MachO && OutputFormat == darwin)
+      outs() << Obj->getFileName() << "\n";
   }
 }
 
 /// Checks to see if the @p O ObjectFile is a Mach-O file and if it is and there
 /// is a list of architecture flags specified then check to make sure this
 /// Mach-O file is one of those architectures or all architectures was
 /// specificed.  If not then an error is generated and this routine returns
 /// false.  Else it returns true.