[tools] [llvm-nm] Revert rL365889

[abrachet]

Summary

git llvm revert rL365889 didn't work, so just doing it by hand.

[jhenderson]

What about it didn't work? Should it have been git llvm revert r365889? If that doesn't work, have you tried the other options described at https://llvm.org/docs/GettingStarted.html#reverting-a-change-when-using-git?

[abrachet]

Yes I tried those. It says

`git log --format=%H --grep '^llvm-svn: 365889$' 'HEAD~10000...HEAD'` returned 128
fatal: ambiguous argument 'HEAD~10000...HEAD': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

I think because I deleted that branch already so it isn't local? I'm not really sure, truthfully.

[jhenderson]

I don't think it's anything to do with your local branch. You should be on an up-to-date master to run it, I think. If that doesn't work, post on the mailing list about it, because it should. Don't just do it by hand.

[abrachet]

I got it to work. The revert is here rL366219. I think it didn't work because I always clone with --depth 1? So I just created a fresh clone.

[rupprecht]

In D64797#1587681, @abrachet wrote:

I got it to work. The revert is here rL366219. I think it didn't work because I always clone with --depth 1? So I just created a fresh clone.

Yes, git llvm revert is ultimately a wrapper around git revert <git commit that git llvm finds>, so if you don't have the commit in your history (with --depth 1 you won't have anything), it won't work.
Certainly we could make it print a better error message, and also handle other call signs (rLNNNNNN, rCNNNNNN, rLLDNNNNNN, etc.)

llvm/docs/CommandGuide/llvm-nm.rst

 llvm-nm - list LLVM bitcode and object file's symbol table
 ==========================================================
 
 .. program:: llvm-nm
 
 SYNOPSIS
 --------
 
 :program:`llvm-nm` [*options*] [*filenames...*]
 
 DESCRIPTION
 -----------
 
 The :program:`llvm-nm` utility lists the names of symbols from LLVM bitcode
 files, object files, and archives. Each symbol is listed along with some simple
-information about its provenance. If no filename is specified, or *-* is used as
-a filename, :program:`llvm-nm` will read a file from its standard input stream.
+information about its provenance. If no filename is specified, *a.out* is used
+as the input. If *-* is used as a filename, :program:`llvm-nm` will read a file
+from its standard input stream.
 
 :program:`llvm-nm`'s default output format is the traditional BSD :program:`nm`
 output format. Each such output record consists of an (optional) 8-digit
 hexadecimal address, followed by a type code character, followed by a name, for
 each symbol. One record is printed per line; fields are separated by spaces.
 When the address is omitted, it is replaced by 8 spaces.
 
 The supported type code characters are as follows. Where both lower and

llvm/test/Object/nm-trivial-object.test

 # COFF-COMMON-NEXT: 00000000 n .file
 # COFF-COMMON-NEXT: 00000000 r .rdata$zzz
 # COFF-COMMON-NEXT: 00000000 t .text
 # COFF-COMMON-NEXT:          C _a
 
 # RUN: mkdir -p %t
 # RUN: cd %t
 # RUN: cp %p/Inputs/trivial-object-test.macho-i386 a.out
-# RUN: llvm-nm a.out | FileCheck %s -check-prefix A-OUT
+# RUN: llvm-nm | FileCheck %s -check-prefix A-OUT
 
 # A-OUT:          U _SomeOtherFunction
 # A-OUT: 00000000 T _main
 # A-OUT:          U _puts

llvm/test/tools/llvm-nm/stdin.test

-## Test llvm-nm when using stdin both explicitly (using '-' as a filename)
-## and implicitly (not specifying any filename).
-
-# RUN: yaml2obj %s -o %t.o
-
-## Pass an explicit filename to produce a baseline output. llvm-nm should
-## have the same behavior when opening a file itself and when reading that
-## file from its standard input stream.
-# RUN: llvm-nm %t.o > %t.base 2> %t.err
-
-## Make sure there is no warning message about no file redirected to stdin.
-# RUN: FileCheck %s --input-file=%t.err --allow-empty --implicit-check-not={{.}}
-
-# RUN: llvm-nm - < %t.o > %t.explicit 2> %t.err
-# RUN: FileCheck %s --input-file=%t.err --allow-empty --implicit-check-not={{.}}
-# RUN: cmp %t.base %t.explicit
-
-# RUN: llvm-nm < %t.o > %t.implicit 2> %t.err
-# RUN: FileCheck %s --input-file=%t.err --allow-empty --implicit-check-not={{.}}
-# RUN: cmp %t.base %t.implicit
-
-!ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_X86_64
-Sections:
-  - Name: .text
-    Type: SHT_PROGBITS
-Symbols:
-  - Name:    symbol_a
-    Section: .text

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

 #include "llvm/Object/MachOUniversal.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Object/Wasm.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Process.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/WithColor.h"
 #include "llvm/Support/raw_ostream.h"
 #include <vector>
 
 using namespace llvm;
if (none_of(ArchFlags, [&](const std::string &Name) {
       })) {
     error("No architecture specified", Filename);
     return false;
   }
   return true;
 }
 
 static void dumpSymbolNamesFromFile(std::string &Filename) {
-  if (Filename == "-" && sys::Process::StandardInIsUserInput()) {
-    WithColor::warning(errs(), ToolName) << "can't read from terminal\n";
-    cl::PrintHelpMessage();
-    HadError = true;
-    return;
-  }
   ErrorOr<std::unique_ptr<MemoryBuffer>> BufferOrErr =
       MemoryBuffer::getFileOrSTDIN(Filename);
   if (error(BufferOrErr.getError(), Filename))
     return;
 
   LLVMContext Context;
   LLVMContext *ContextPtr = NoLLVMBitcode ? nullptr : &Context;
   Expected<std::unique_ptr<Binary>> BinaryOrErr =
int main(int argc, char **argv) {
   // The relative order of these is important. If you pass --size-sort it should
   // only print out the size. However, if you pass -S --size-sort, it should
   // print out both the size and address.
   if (SizeSort && !PrintSize)
     PrintAddress = false;
   if (OutputFormat == sysv || SizeSort)
     PrintSize = true;
   if (InputFilenames.empty())
-    InputFilenames.push_back("-");
+    InputFilenames.push_back("a.out");
   if (InputFilenames.size() > 1)
     MultipleFiles = true;
 
   // If both --demangle and --no-demangle are specified then pick the last one.
   if (NoDemangle.getPosition() > Demangle.getPosition())
     Demangle = !NoDemangle;
 
   for (unsigned i = 0; i < ArchFlags.size(); ++i) {