Skip to content

Commit

Permalink
Revert "[CLANG][DWARF] Do not emit -ggnu-pubnames for split dwarf ver…
Browse files Browse the repository at this point in the history
…sion 5." (#83214)

Reverts #82840
  • Loading branch information
ayermolo committed Feb 28, 2024
1 parent bcbce80 commit dba2dd2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
7 changes: 3 additions & 4 deletions clang/lib/Driver/ToolChains/Clang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4479,10 +4479,9 @@ renderDebugOptions(const ToolChain &TC, const Driver &D, const llvm::Triple &T,
options::OPT_gpubnames, options::OPT_gno_pubnames);
if (DwarfFission != DwarfFissionKind::None ||
(PubnamesArg && checkDebugInfoOption(PubnamesArg, Args, D, TC)))
if (DebuggerTuning != llvm::DebuggerKind::LLDB &&
(!PubnamesArg ||
(!PubnamesArg->getOption().matches(options::OPT_gno_gnu_pubnames) &&
!PubnamesArg->getOption().matches(options::OPT_gno_pubnames))))
if (!PubnamesArg ||
(!PubnamesArg->getOption().matches(options::OPT_gno_gnu_pubnames) &&
!PubnamesArg->getOption().matches(options::OPT_gno_pubnames)))
CmdArgs.push_back(PubnamesArg && PubnamesArg->getOption().matches(
options::OPT_gpubnames)
? "-gpubnames"
Expand Down
5 changes: 0 additions & 5 deletions clang/test/Driver/split-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,3 @@
// G1_NOSPLIT: "-debug-info-kind=line-tables-only"
// G1_NOSPLIT-NOT: "-split-dwarf-file"
// G1_NOSPLIT-NOT: "-split-dwarf-output"

/// Do not generate -ggnu-pubnames for -glldb
// RUN: %clang -### -c -target x86_64 -gsplit-dwarf -g -glldb %s 2>&1 | FileCheck %s --check-prefixes=GLLDBSPLIT

// GLLDBSPLIT-NOT: "-ggnu-pubnames"

0 comments on commit dba2dd2

Please sign in to comment.