r305182 - Revert r305164/5/7.

David Blaikie via cfe-commits cfe-commits at lists.llvm.org
Mon Jun 12 12:02:00 PDT 2017


hey Saleem - might be worth sending a cfe-dev email about what the general
direction/goals are here (may not need precommit review for every patch,
but just some sanity checking)

On Mon, Jun 12, 2017 at 1:08 AM Daniel Jasper via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Author: djasper
> Date: Mon Jun 12 03:08:18 2017
> New Revision: 305182
>
> URL: http://llvm.org/viewvc/llvm-project?rev=305182&view=rev
> Log:
> Revert r305164/5/7.
>
> cc1as does not currently access the "--" version of this flag. At the
> very least this needs to be fixed and proper test cases need to be
> added.
>
> Simple reproducer:
> clang -Wa,--compress-debug-sections /tmp/test.cc
>
> Result:
> error: unknown argument: '--compress-debug-sections'
>
> Removed:
>     cfe/trunk/test/Driver/compress-noias.c
> Modified:
>     cfe/trunk/include/clang/Driver/CC1Options.td
>     cfe/trunk/include/clang/Driver/Options.td
>     cfe/trunk/lib/Driver/ToolChains/Clang.cpp
>     cfe/trunk/lib/Driver/ToolChains/Gnu.cpp
>     cfe/trunk/lib/Frontend/CompilerInvocation.cpp
>     cfe/trunk/test/Driver/compress.c
>     cfe/trunk/test/Driver/nozlibcompress.c
>     cfe/trunk/tools/driver/cc1as_main.cpp
>
> Modified: cfe/trunk/include/clang/Driver/CC1Options.td
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=305182&r1=305181&r2=305182&view=diff
>
> ==============================================================================
> --- cfe/trunk/include/clang/Driver/CC1Options.td (original)
> +++ cfe/trunk/include/clang/Driver/CC1Options.td Mon Jun 12 03:08:18 2017
> @@ -134,6 +134,7 @@ def migrator_no_finalize_removal : Flag<
>
>  //===----------------------------------------------------------------------===//
>
>  let Flags = [CC1Option, CC1AsOption, NoDriverOption] in {
> +
>  def debug_info_kind_EQ : Joined<["-"], "debug-info-kind=">;
>  def debug_info_macro : Flag<["-"], "debug-info-macro">,
>    HelpText<"Emit macro debug information">;
> @@ -143,16 +144,14 @@ def fdebug_compilation_dir : Separate<["
>    HelpText<"The compilation directory to embed in the debug info.">;
>  def dwarf_debug_flags : Separate<["-"], "dwarf-debug-flags">,
>    HelpText<"The string to embed in the Dwarf debug flags record.">;
> -def compress_debug_sections : Flag<["-"], "compress-debug-sections">,
> -    HelpText<"DWARF debug sections compression">;
> -def compress_debug_sections_EQ : Flag<["-"], "compress-debug-sections=">,
> -    HelpText<"DWARF debug sections compression type">;
>  def mno_exec_stack : Flag<["-"], "mnoexecstack">,
>    HelpText<"Mark the file as not needing an executable stack">;
>  def massembler_fatal_warnings : Flag<["-"], "massembler-fatal-warnings">,
>    HelpText<"Make assembler warnings fatal">;
>  def mrelax_relocations : Flag<["--"], "mrelax-relocations">,
>      HelpText<"Use relaxable elf relocations">;
> +def compress_debug_sections : Flag<["-"], "compress-debug-sections">,
> +    HelpText<"Compress DWARF debug sections using zlib">;
>  def msave_temp_labels : Flag<["-"], "msave-temp-labels">,
>    HelpText<"Save temporary labels in the symbol table. "
>             "Note this may change .s semantics and shouldn't generally be
> used "
>
> Modified: cfe/trunk/include/clang/Driver/Options.td
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=305182&r1=305181&r2=305182&view=diff
>
> ==============================================================================
> --- cfe/trunk/include/clang/Driver/Options.td (original)
> +++ cfe/trunk/include/clang/Driver/Options.td Mon Jun 12 03:08:18 2017
> @@ -1563,10 +1563,6 @@ def gdwarf_aranges : Flag<["-"], "gdwarf
>  def gmodules : Flag <["-"], "gmodules">, Group<gN_Group>,
>    HelpText<"Generate debug info with external references to clang modules"
>             " or precompiled headers">;
> -def gz : Flag<["-"], "gz">, Group<g_flags_Group>,
> -    HelpText<"DWARF debug sections compression type">;
> -def gz_EQ : Joined<["-"], "gz=">, Group<g_flags_Group>,
> -    HelpText<"DWARF debug sections compression type">;
>  def headerpad__max__install__names : Joined<["-"],
> "headerpad_max_install_names">;
>  def help : Flag<["-", "--"], "help">, Flags<[CC1Option,CC1AsOption]>,
>    HelpText<"Display available options">;
>
> Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=305182&r1=305181&r2=305182&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original)
> +++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Mon Jun 12 03:08:18 2017
> @@ -910,37 +910,6 @@ static void RenderDebugEnablingArgs(cons
>    }
>  }
>
> -static void RenderDebugInfoCompressionArgs(const ArgList &Args,
> -                                           ArgStringList &CmdArgs,
> -                                           const Driver &D) {
> -  const Arg *A = Args.getLastArg(options::OPT_gz, options::OPT_gz_EQ);
> -  if (!A)
> -    return;
> -
> -  if (A->getOption().getID() == options::OPT_gz) {
> -    if (llvm::zlib::isAvailable())
> -      CmdArgs.push_back("-compress-debug-sections");
> -    else
> -      D.Diag(diag::warn_debug_compression_unavailable);
> -    return;
> -  }
> -
> -  StringRef Value = A->getValue();
> -  if (Value == "none") {
> -    CmdArgs.push_back("-compress-debug-sections=none");
> -  } else if (Value == "zlib" || Value == "zlib-gnu") {
> -    if (llvm::zlib::isAvailable()) {
> -      CmdArgs.push_back(
> -          Args.MakeArgString("-compress-debug-sections=" + Twine(Value)));
> -    } else {
> -      D.Diag(diag::warn_debug_compression_unavailable);
> -    }
> -  } else {
> -    D.Diag(diag::err_drv_unsupported_option_argument)
> -        << A->getOption().getName() << Value;
> -  }
> -}
> -
>  static const char *RelocationModelName(llvm::Reloc::Model Model) {
>    switch (Model) {
>    case llvm::Reloc::Static:
> @@ -1775,6 +1744,10 @@ static void CollectArgsForIntegratedAsse
>    // arg after parsing the '-I' arg.
>    bool TakeNextArg = false;
>
> +  // When using an integrated assembler, translate -Wa, and -Xassembler
> +  // options.
> +  bool CompressDebugSections = false;
> +
>    bool UseRelaxRelocations = ENABLE_X86_RELAX_RELOCATIONS;
>    const char *MipsTargetFeature = nullptr;
>    for (const Arg *A :
> @@ -1849,11 +1822,12 @@ static void CollectArgsForIntegratedAsse
>          CmdArgs.push_back("-massembler-fatal-warnings");
>        } else if (Value == "--noexecstack") {
>          CmdArgs.push_back("-mnoexecstack");
> -      } else if (Value.startswith("-compress-debug-sections") ||
> -                 Value.startswith("--compress-debug-sections") ||
> -                 Value == "-nocompress-debug-sections" ||
> +      } else if (Value == "-compress-debug-sections" ||
> +                 Value == "--compress-debug-sections") {
> +        CompressDebugSections = true;
> +      } else if (Value == "-nocompress-debug-sections" ||
>                   Value == "--nocompress-debug-sections") {
> -        CmdArgs.push_back(Value.data());
> +        CompressDebugSections = false;
>        } else if (Value == "-mrelax-relocations=yes" ||
>                   Value == "--mrelax-relocations=yes") {
>          UseRelaxRelocations = true;
> @@ -1906,6 +1880,12 @@ static void CollectArgsForIntegratedAsse
>        }
>      }
>    }
> +  if (CompressDebugSections) {
> +    if (llvm::zlib::isAvailable())
> +      CmdArgs.push_back("-compress-debug-sections");
> +    else
> +      D.Diag(diag::warn_debug_compression_unavailable);
> +  }
>    if (UseRelaxRelocations)
>      CmdArgs.push_back("--mrelax-relocations");
>    if (MipsTargetFeature != nullptr) {
> @@ -2841,8 +2821,6 @@ void Clang::ConstructJob(Compilation &C,
>      CmdArgs.push_back("-generate-type-units");
>    }
>
> -  RenderDebugInfoCompressionArgs(Args, CmdArgs, D);
> -
>    bool UseSeparateSections = isUseSeparateSections(Triple);
>
>    if (Args.hasFlag(options::OPT_ffunction_sections,
> @@ -4946,7 +4924,6 @@ void ClangAs::ConstructJob(Compilation &
>
>    const llvm::Triple &Triple = getToolChain().getEffectiveTriple();
>    const std::string &TripleStr = Triple.getTriple();
> -  const auto &D = getToolChain().getDriver();
>
>    // Don't warn about "clang -w -c foo.s"
>    Args.ClaimAllArgs(options::OPT_w);
> @@ -5034,8 +5011,6 @@ void ClangAs::ConstructJob(Compilation &
>    }
>    RenderDebugEnablingArgs(Args, CmdArgs, DebugInfoKind, DwarfVersion,
>                            llvm::DebuggerKind::Default);
> -  RenderDebugInfoCompressionArgs(Args, CmdArgs, D);
> -
>
>    // Handle -fPIC et al -- the relocation-model affects the assembler
>    // for some targets.
>
> Modified: cfe/trunk/lib/Driver/ToolChains/Gnu.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Gnu.cpp?rev=305182&r1=305181&r2=305182&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Driver/ToolChains/Gnu.cpp (original)
> +++ cfe/trunk/lib/Driver/ToolChains/Gnu.cpp Mon Jun 12 03:08:18 2017
> @@ -650,8 +650,6 @@ void tools::gnutools::Assembler::Constru
>                                                const InputInfoList &Inputs,
>                                                const ArgList &Args,
>                                                const char *LinkingOutput)
> const {
> -  const auto &D = getToolChain().getDriver();
> -
>    claimNoWarnArgs(Args);
>
>    ArgStringList CmdArgs;
> @@ -662,23 +660,6 @@ void tools::gnutools::Assembler::Constru
>    std::tie(RelocationModel, PICLevel, IsPIE) =
>        ParsePICArgs(getToolChain(), Args);
>
> -  if (const Arg *A = Args.getLastArg(options::OPT_gz,
> options::OPT_gz_EQ)) {
> -    if (A->getOption().getID() == options::OPT_gz) {
> -      CmdArgs.push_back("-compress-debug-sections");
> -    } else {
> -      StringRef Value = A->getValue();
> -      if (Value == "none") {
> -        CmdArgs.push_back("-compress-debug-sections=none");
> -      } else if (Value == "zlib" || Value == "zlib-gnu") {
> -        CmdArgs.push_back(
> -            Args.MakeArgString("-compress-debug-sections=" +
> Twine(Value)));
> -      } else {
> -        D.Diag(diag::err_drv_unsupported_option_argument)
> -            << A->getOption().getName() << Value;
> -      }
> -    }
> -  }
> -
>    switch (getToolChain().getArch()) {
>    default:
>      break;
>
> Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=305182&r1=305181&r2=305182&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)
> +++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Mon Jun 12 03:08:18 2017
> @@ -739,22 +739,9 @@ static bool ParseCodeGenArgs(CodeGenOpti
>    Opts.InstrumentForProfiling = Args.hasArg(OPT_pg);
>    Opts.CallFEntry = Args.hasArg(OPT_mfentry);
>    Opts.EmitOpenCLArgMetadata = Args.hasArg(OPT_cl_kernel_arg_info);
> -
> -  if (const Arg *A = Args.getLastArg(OPT_compress_debug_sections,
> -                                     OPT_compress_debug_sections_EQ)) {
> -    if (A->getOption().getID() == OPT_compress_debug_sections) {
> -      // TODO: be more clever about the compression type auto-detection
> -      Opts.setCompressDebugSections(llvm::DebugCompressionType::GNU);
> -    } else {
> -      auto DCT =
> llvm::StringSwitch<llvm::DebugCompressionType>(A->getValue())
> -                     .Case("none", llvm::DebugCompressionType::None)
> -                     .Case("zlib", llvm::DebugCompressionType::Z)
> -                     .Case("zlib-gnu", llvm::DebugCompressionType::GNU)
> -                     .Default(llvm::DebugCompressionType::None);
> -      Opts.setCompressDebugSections(DCT);
> -    }
> -  }
> -
> +  // TODO: map this from -gz in the driver and give it a named value
> +  if (Args.hasArg(OPT_compress_debug_sections))
> +    Opts.setCompressDebugSections(llvm::DebugCompressionType::GNU);
>    Opts.RelaxELFRelocations = Args.hasArg(OPT_mrelax_relocations);
>    Opts.DebugCompilationDir =
> Args.getLastArgValue(OPT_fdebug_compilation_dir);
>    for (auto A : Args.filtered(OPT_mlink_bitcode_file,
> OPT_mlink_cuda_bitcode)) {
>
> Removed: cfe/trunk/test/Driver/compress-noias.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/compress-noias.c?rev=305181&view=auto
>
> ==============================================================================
> --- cfe/trunk/test/Driver/compress-noias.c (original)
> +++ cfe/trunk/test/Driver/compress-noias.c (removed)
> @@ -1,37 +0,0 @@
> -// REQUIRES: zlib
> -// REQUIRES: x86-registered-target
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -Wa,-compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix
> CHECK-_COMPRESS_DEBUG_SECTIONS %s
> -// CHECK-_COMPRESS_DEBUG_SECTIONS: "-compress-debug-sections"
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -Wa,--compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix
> CHECK-__COMPRESS_DEBUG_SECTIONS %s
> -// CHECK-__COMPRESS_DEBUG_SECTIONS: "--compress-debug-sections"
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -Wa,--compress-debug-sections -Wa,--nocompress-debug-sections -c %s 2>&1 |
> FileCheck -check-prefix CHECK-POSNEG %s
> -// CHECK-POSNEG: "--compress-debug-sections"
> -// CHECK-POSNEG: "--nocompress-debug-sections"
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -Wa,-compress-debug-sections -Wa,--compress-debug-sections -c %s 2>&1 |
> FileCheck -check-prefix CHECK-MULTIPLE %s
> -// CHECK-MULTIPLE: "-compress-debug-sections"
> -// CHECK-MULTIPLE: "--compress-debug-sections"
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz
> -x assembler -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ %s
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as -gz
> -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ %s
> -// CHECK-OPT_GZ: "-compress-debug-sections"
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -gz=none -x assembler -c %s 2>&1 | FileCheck -check-prefix
> CHECK-OPT_GZ_EQ_NONE %s
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -gz=none -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_NONE %s
> -// CHECK-OPT_GZ_EQ_NONE: "-compress-debug-sections=none"
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -gz=zlib -x assembler -c %s 2>&1 | FileCheck -check-prefix
> CHECK-OPT_GZ_EQ_ZLIB %s
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -gz=zlib -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB %s
> -// CHECK-OPT_GZ_EQ_ZLIB: "-compress-debug-sections=zlib"
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -gz=zlib-gnu -x assembler -c %s 2>&1 | FileCheck -check-prefix
> CHECK-OPT_GZ_EQ_ZLIB_GNU %s
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -gz=zlib-gnu -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB_GNU
> %s
> -// CHECK-OPT_GZ_EQ_ZLIB_GNU: "-compress-debug-sections=zlib-gnu"
> -
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -gz=invalid -x assembler -c %s 2>&1 | FileCheck -check-prefix
> CHECK-OPT_GZ_EQ_INVALID %s
> -// RUN: %clang -### -target i686-unknown-linux-gnu -fno-integrated-as
> -gz=invalid -c %s 2>&1 | FileCheck -check-prefix CHECK-OPT_GZ_EQ_INVALID %s
> -// CHECK-OPT_GZ_EQ_INVALID: error: unsupported argument 'invalid' to
> option 'gz='
> -
>
> Modified: cfe/trunk/test/Driver/compress.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/compress.c?rev=305182&r1=305181&r2=305182&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/Driver/compress.c (original)
> +++ cfe/trunk/test/Driver/compress.c Mon Jun 12 03:08:18 2017
> @@ -1,36 +1,8 @@
> +// RUN: %clang -### -c -integrated-as -Wa,-compress-debug-sections %s
> 2>&1 | FileCheck --check-prefix=COMPRESS_DEBUG %s
> +// RUN: %clang -### -c -integrated-as -Wa,--compress-debug-sections %s
> 2>&1 | FileCheck --check-prefix=COMPRESS_DEBUG %s
>  // REQUIRES: zlib
>
> -// RUN: %clang -### -fintegrated-as -Wa,-compress-debug-sections -c %s
> 2>&1 | FileCheck -check-prefix CHECK-_COMPRESS_DEBUG_SECTIONS %s
> -// CHECK-_COMPRESS_DEBUG_SECTIONS: "-compress-debug-sections"
> -
> -// RUN: %clang -### -fintegrated-as -Wa,--compress-debug-sections -c %s
> 2>&1 | FileCheck -check-prefix CHECK-__COMPRESS_DEBUG_SECTIONS %s
> -// CHECK-__COMPRESS_DEBUG_SECTIONS: "--compress-debug-sections"
> -
> -// RUN: %clang -### -fintegrated-as -Wa,--compress-debug-sections
> -Wa,--nocompress-debug-sections -c %s 2>&1 | FileCheck -check-prefix
> CHECK-POSNEG %s
> -// CHECK-POSNEG: "--compress-debug-sections"
> -// CHECK-POSNEG: "--nocompress-debug-sections"
> -
> -// RUN: %clang -### -fintegrated-as -Wa,-compress-debug-sections
> -Wa,--compress-debug-sections -c %s 2>&1 | FileCheck -check-prefix
> CHECK-MULTIPLE %s
> -// CHECK-MULTIPLE: "-compress-debug-sections"
> -// CHECK-MULTIPLE: "--compress-debug-sections"
> -
> -// RUN: %clang -### -fintegrated-as -gz -x assembler -c %s 2>&1 |
> FileCheck -check-prefix CHECK-OPT_GZ %s
> -// RUN: %clang -### -fintegrated-as -gz -c %s 2>&1 | FileCheck
> -check-prefix CHECK-OPT_GZ %s
> -// CHECK-OPT_GZ: "-compress-debug-sections"
> -
> -// RUN: %clang -### -fintegrated-as -gz=none -x assembler -c %s 2>&1 |
> FileCheck -check-prefix CHECK-OPT_GZ_EQ_NONE %s
> -// RUN: %clang -### -fintegrated-as -gz=none -c %s 2>&1 | FileCheck
> -check-prefix CHECK-OPT_GZ_EQ_NONE %s
> -// CHECK-OPT_GZ_EQ_NONE: "-compress-debug-sections=none"
> -
> -// RUN: %clang -### -fintegrated-as -gz=zlib -x assembler -c %s 2>&1 |
> FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB %s
> -// RUN: %clang -### -fintegrated-as -gz=zlib -c %s 2>&1 | FileCheck
> -check-prefix CHECK-OPT_GZ_EQ_ZLIB %s
> -// CHECK-OPT_GZ_EQ_ZLIB: "-compress-debug-sections=zlib"
> -
> -// RUN: %clang -### -fintegrated-as -gz=zlib-gnu -x assembler -c %s 2>&1
> | FileCheck -check-prefix CHECK-OPT_GZ_EQ_ZLIB_GNU %s
> -// RUN: %clang -### -fintegrated-as -gz=zlib-gnu -c %s 2>&1 | FileCheck
> -check-prefix CHECK-OPT_GZ_EQ_ZLIB_GNU %s
> -// CHECK-OPT_GZ_EQ_ZLIB_GNU: "-compress-debug-sections=zlib-gnu"
> -
> -// RUN: %clang -### -fintegrated-as -gz=invalid -x assembler -c %s 2>&1 |
> FileCheck -check-prefix CHECK-OPT_GZ_EQ_INVALID %s
> -// RUN: %clang -### -fintegrated-as -gz=invalid -c %s 2>&1 | FileCheck
> -check-prefix CHECK-OPT_GZ_EQ_INVALID %s
> -// CHECK-OPT_GZ_EQ_INVALID: error: unsupported argument 'invalid' to
> option 'gz='
> +// COMPRESS_DEBUG: "-compress-debug-sections"
>
> +// RUN: %clang -### -c -integrated-as -Wa,--compress-debug-sections
> -Wa,--nocompress-debug-sections %s 2>&1 | FileCheck
> --check-prefix=NOCOMPRESS_DEBUG %s
> +// NOCOMPRESS_DEBUG-NOT: "-compress-debug-sections"
>
> Modified: cfe/trunk/test/Driver/nozlibcompress.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/nozlibcompress.c?rev=305182&r1=305181&r2=305182&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/Driver/nozlibcompress.c (original)
> +++ cfe/trunk/test/Driver/nozlibcompress.c Mon Jun 12 03:08:18 2017
> @@ -1,7 +1,6 @@
> +// RUN: %clang -c %s -Wa,--compress-debug-sections 2>&1 | FileCheck %s
> +// RUN: %clang -c %s -Wa,--compress-debug-sections
> -Wa,--nocompress-debug-sections 2>&1 | FileCheck --allow-empty
> --check-prefix=NOWARN %s
>  // REQUIRES: nozlib
>
> -// RUN: %clang -fintegrated-as -gz -c %s 2>&1 | FileCheck %s
> -check-prefix CHECK-WARN
> -// RUN: %clang -fintegrated-as -gz=none -c %s 2>&1 | FileCheck
> -allow-empty -check-prefix CHECK-NOWARN %s
> -
> -// CHECK-WARN: warning: cannot compress debug sections (zlib not
> installed)
> -// CHECK-NOWARN-NOT: warning: cannot compress debug sections (zlib not
> installed)
> +// CHECK: warning: cannot compress debug sections (zlib not installed)
> +// NOWARN-NOT: warning: cannot compress debug sections (zlib not
> installed)
>
> Modified: cfe/trunk/tools/driver/cc1as_main.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=305182&r1=305181&r2=305182&view=diff
>
> ==============================================================================
> --- cfe/trunk/tools/driver/cc1as_main.cpp (original)
> +++ cfe/trunk/tools/driver/cc1as_main.cpp Mon Jun 12 03:08:18 2017
> @@ -202,22 +202,9 @@ bool AssemblerInvocation::CreateFromArgs
>    Opts.SaveTemporaryLabels = Args.hasArg(OPT_msave_temp_labels);
>    // Any DebugInfoKind implies GenDwarfForAssembly.
>    Opts.GenDwarfForAssembly = Args.hasArg(OPT_debug_info_kind_EQ);
> -
> -  if (const Arg *A = Args.getLastArg(OPT_compress_debug_sections,
> -                                     OPT_compress_debug_sections_EQ)) {
> -    if (A->getOption().getID() == OPT_compress_debug_sections) {
> -      // TODO: be more clever about the compression type auto-detection
> -      Opts.CompressDebugSections = llvm::DebugCompressionType::GNU;
> -    } else {
> -      Opts.CompressDebugSections =
> -          llvm::StringSwitch<llvm::DebugCompressionType>(A->getValue())
> -              .Case("none", llvm::DebugCompressionType::None)
> -              .Case("zlib", llvm::DebugCompressionType::Z)
> -              .Case("zlib-gnu", llvm::DebugCompressionType::GNU)
> -              .Default(llvm::DebugCompressionType::None);
> -    }
> -  }
> -
> +  // TODO: base this on -gz instead
> +  if (Args.hasArg(OPT_compress_debug_sections))
> +    Opts.CompressDebugSections = llvm::DebugCompressionType::GNU;
>    Opts.RelaxELFRelocations = Args.hasArg(OPT_mrelax_relocations);
>    Opts.DwarfVersion = getLastArgIntValue(Args, OPT_dwarf_version_EQ, 2,
> Diags);
>    Opts.DwarfDebugFlags = Args.getLastArgValue(OPT_dwarf_debug_flags);
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170612/9fd7a139/attachment-0001.html>


More information about the cfe-commits mailing list