[llvm] r366219 - Revert [tools] [llvm-nm] Default to reading from stdin not a.out

[Roman Lebedev via llvm-commits]

It is customary to specify the revert reason in the commit message.

On Tue, Jul 16, 2019 at 6:33 PM Alex Brachet via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: abrachet
> Date: Tue Jul 16 08:33:43 2019
> New Revision: 366219
>
> URL: http://llvm.org/viewvc/llvm-project?rev=366219&view=rev
> Log:
> Revert [tools] [llvm-nm] Default to reading from stdin not a.out
>
> This reverts r365889 (git commit 60c81354b1d3fced1bd284d334f118d2d792ab4b)
>
> Removed:
>     llvm/trunk/test/tools/llvm-nm/stdin.test
> Modified:
>     llvm/trunk/docs/CommandGuide/llvm-nm.rst
>     llvm/trunk/tools/llvm-nm/llvm-nm.cpp
>
> Modified: llvm/trunk/docs/CommandGuide/llvm-nm.rst
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/llvm-nm.rst?rev=366219&r1=366218&r2=366219&view=diff
> ==============================================================================
> --- llvm/trunk/docs/CommandGuide/llvm-nm.rst (original)
> +++ llvm/trunk/docs/CommandGuide/llvm-nm.rst Tue Jul 16 08:33:43 2019
> @@ -13,8 +13,9 @@ 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
>
> Removed: llvm/trunk/test/tools/llvm-nm/stdin.test
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-nm/stdin.test?rev=366218&view=auto
> ==============================================================================
> --- llvm/trunk/test/tools/llvm-nm/stdin.test (original)
> +++ llvm/trunk/test/tools/llvm-nm/stdin.test (removed)
> @@ -1,33 +0,0 @@
> -## 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
>
> Modified: llvm/trunk/tools/llvm-nm/llvm-nm.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-nm/llvm-nm.cpp?rev=366219&r1=366218&r2=366219&view=diff
> ==============================================================================
> --- llvm/trunk/tools/llvm-nm/llvm-nm.cpp (original)
> +++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp Tue Jul 16 08:33:43 2019
> @@ -34,7 +34,6 @@
>  #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"
> @@ -1752,12 +1751,6 @@ static bool checkMachOAndArchFlags(Symbo
>  }
>
>  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))
> @@ -2089,7 +2082,7 @@ int main(int argc, char **argv) {
>    if (OutputFormat == sysv || SizeSort)
>      PrintSize = true;
>    if (InputFilenames.empty())
> -    InputFilenames.push_back("-");
> +    InputFilenames.push_back("a.out");
>    if (InputFilenames.size() > 1)
>      MultipleFiles = true;
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits