From 0120b056bc8a9d05abb28fa051c48c1eadcc7cb0 Mon Sep 17 00:00:00 2001 From: Sean Fertile Date: Thu, 11 Oct 2018 18:40:35 +0000 Subject: [PATCH] Revert "clang-cl: Add /showFilenames option (PR31957)" This reverts https://reviews.llvm.org/rL344234 which is causing failures on several bots due to invalid llvm.linker.options. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@344276 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/CLCompatOptions.td | 4 ---- include/clang/Driver/Job.h | 6 ------ lib/Driver/Job.cpp | 6 ------ lib/Driver/ToolChains/Clang.cpp | 7 ------- test/Driver/cl-showfilenames.c | 19 ------------------- 5 files changed, 42 deletions(-) delete mode 100644 test/Driver/cl-showfilenames.c diff --git a/include/clang/Driver/CLCompatOptions.td b/include/clang/Driver/CLCompatOptions.td index 3c2bef74ed..62a4497ac4 100644 --- a/include/clang/Driver/CLCompatOptions.td +++ b/include/clang/Driver/CLCompatOptions.td @@ -158,10 +158,6 @@ def _SLASH_Qvec_ : CLFlag<"Qvec-">, def _SLASH_showIncludes : CLFlag<"showIncludes">, HelpText<"Print info about included files to stderr">, Alias; -def _SLASH_showFilenames : CLFlag<"showFilenames">, - HelpText<"Print the name of each compiled file">; -def _SLASH_showFilenames_ : CLFlag<"showFilenames-">, - HelpText<"Don't print the name of each compiled file (default)">; def _SLASH_source_charset : CLCompileJoined<"source-charset:">, HelpText<"Source encoding, supports only UTF-8">, Alias; def _SLASH_execution_charset : CLCompileJoined<"execution-charset:">, diff --git a/include/clang/Driver/Job.h b/include/clang/Driver/Job.h index 7a0b769e44..47d9e992ba 100644 --- a/include/clang/Driver/Job.h +++ b/include/clang/Driver/Job.h @@ -59,9 +59,6 @@ class Command { /// The list of program arguments which are inputs. llvm::opt::ArgStringList InputFilenames; - /// Whether to print the input filenames when executing. - bool PrintInputFilenames = false; - /// Response file name, if this command is set to use one, or nullptr /// otherwise const char *ResponseFile = nullptr; @@ -131,9 +128,6 @@ public: /// Print a command argument, and optionally quote it. static void printArg(llvm::raw_ostream &OS, StringRef Arg, bool Quote); - - /// Set whether to print the input filenames when executing. - void setPrintInputFilenames(bool P) { PrintInputFilenames = P; } }; /// Like Command, but with a fallback which is executed in case diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp index 114efe1998..bd1a9bd8e3 100644 --- a/lib/Driver/Job.cpp +++ b/lib/Driver/Job.cpp @@ -315,12 +315,6 @@ void Command::setEnvironment(llvm::ArrayRef NewEnvironment) { int Command::Execute(ArrayRef> Redirects, std::string *ErrMsg, bool *ExecutionFailed) const { - if (PrintInputFilenames) { - for (const char *Arg : InputFilenames) - llvm::outs() << llvm::sys::path::filename(Arg) << "\n"; - llvm::outs().flush(); - } - SmallVector Argv; Optional> Env; diff --git a/lib/Driver/ToolChains/Clang.cpp b/lib/Driver/ToolChains/Clang.cpp index 4d2cb14a51..127f806962 100644 --- a/lib/Driver/ToolChains/Clang.cpp +++ b/lib/Driver/ToolChains/Clang.cpp @@ -5067,13 +5067,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, C.addCommand(llvm::make_unique(JA, *this, Exec, CmdArgs, Inputs)); } - // Make the compile command echo its inputs for /showFilenames. - if (Output.getType() == types::TY_Object && - Args.hasFlag(options::OPT__SLASH_showFilenames, - options::OPT__SLASH_showFilenames_, false)) { - C.getJobs().getJobs().back()->setPrintInputFilenames(true); - } - if (Arg *A = Args.getLastArg(options::OPT_pg)) if (!shouldUseFramePointer(Args, Triple)) D.Diag(diag::err_drv_argument_not_allowed_with) << "-fomit-frame-pointer" diff --git a/test/Driver/cl-showfilenames.c b/test/Driver/cl-showfilenames.c deleted file mode 100644 index fff7cb4d59..0000000000 --- a/test/Driver/cl-showfilenames.c +++ /dev/null @@ -1,19 +0,0 @@ -// RUN: %clang_cl /c /o %t.obj /showFilenames -- %s 2>&1 | FileCheck -check-prefix=show %s -// RUN: %clang_cl /c /o %t.obj /showFilenames -- %s %S/Inputs/wildcard*.c 2>&1 | FileCheck -check-prefix=multiple %s - -// RUN: %clang_cl /c /o %t.obj -- %s 2>&1 | FileCheck -check-prefix=noshow %s -// RUN: %clang_cl /c /o %t.obj /showFilenames /showFilenames- -- %s 2>&1 | FileCheck -check-prefix=noshow %s - - -#pragma message "Hello" - -// show: cl-showfilenames.c -// show-NEXT: warning: Hello - -// multiple: cl-showfilenames.c -// multiple-NEXT: warning: Hello -// multiple: wildcard1.c -// multiple-NEXT: wildcard2.c - -// noshow: warning: Hello -// noshow-NOT: cl-showfilenames.c -- 2.50.1