<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal">Matching llvm-objcopy works for us, thanks!<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Douglas Yung<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><b>From:</b> Fangrui Song <i@maskray.me> <br>
<b>Sent:</b> Thursday, August 6, 2020 22:26<br>
<b>To:</b> Yung, Douglas <douglas.yung@sony.com><br>
<b>Cc:</b> Fangrui Song <llvmlistbot@llvm.org>; llvm-commits@lists.llvm.org<br>
<b>Subject:</b> Re: [llvm] 593e196 - [llvm-symbolizer] Switch command line parsing from llvm::cl to OptTable<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<p class="MsoNormal">On Thu, Aug 6, 2020 at 2:46 PM Yung, Douglas <<a href="mailto:douglas.yung@sony.com">douglas.yung@sony.com</a>> wrote:<o:p></o:p></p>
</div>
<div>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in">
<p class="MsoNormal">Hi,<br>
<br>
This change removed the "--version" option from llvm-symbolizer, was that intentional?
<br>
<br>
Douglas Yung<o:p></o:p></p>
</blockquote>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Not intentional. llvm::cl has a built-in --version option. I think we should add it back, probably with a -v alias.<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">What should we print? Similar to llvm-objcopy --version?<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"> <o:p></o:p></p>
</div>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in">
<p class="MsoNormal">-----Original Message-----<br>
From: llvm-commits <<a href="mailto:llvm-commits-bounces@lists.llvm.org" target="_blank">llvm-commits-bounces@lists.llvm.org</a>> On Behalf Of Fangrui Song via llvm-commits<br>
Sent: Tuesday, August 4, 2020 8:54<br>
To: <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
Subject: [llvm] 593e196 - [llvm-symbolizer] Switch command line parsing from llvm::cl to OptTable<br>
<br>
<br>
Author: Fangrui Song<br>
Date: 2020-08-04T08:53:15-07:00<br>
New Revision: 593e19629744d6c8ba45fe4bb78910cf653cd6a7<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/593e19629744d6c8ba45fe4bb78910cf653cd6a7" target="_blank">
https://github.com/llvm/llvm-project/commit/593e19629744d6c8ba45fe4bb78910cf653cd6a7</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/593e19629744d6c8ba45fe4bb78910cf653cd6a7.diff" target="_blank">
https://github.com/llvm/llvm-project/commit/593e19629744d6c8ba45fe4bb78910cf653cd6a7.diff</a><br>
<br>
LOG: [llvm-symbolizer] Switch command line parsing from llvm::cl to OptTable<br>
<br>
for the advantage outlined by D83639 ([OptTable] Support grouped short options)<br>
<br>
Some behavior changes:<br>
<br>
* -i={0,false} is removed. Use --no-inlines instead.<br>
* --demangle={0,false} is removed. Use --no-demangle instead<br>
* -untag-addresses={0,false} is removed. Use --no-untag-addresses instead<br>
<br>
Added a higher level API OptTable::parseArgs which handles optional initial options populated from an environment variable, expands response files recursively, and parses options.<br>
<br>
Reviewed By: jhenderson<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D83530" target="_blank">
https://reviews.llvm.org/D83530</a><br>
<br>
Added: <br>
llvm/test/tools/llvm-symbolizer/unknown-argument.test<br>
llvm/tools/llvm-symbolizer/Opts.td<br>
<br>
Modified: <br>
llvm/docs/CommandGuide/llvm-symbolizer.rst<br>
llvm/include/llvm/Option/OptTable.h<br>
llvm/include/llvm/Support/CommandLine.h<br>
llvm/lib/Option/OptTable.cpp<br>
llvm/lib/Support/CommandLine.cpp<br>
llvm/test/DebugInfo/debuglineinfo-path.ll<br>
llvm/test/tools/llvm-symbolizer/basic.s<br>
llvm/test/tools/llvm-symbolizer/help.test<br>
llvm/test/tools/llvm-symbolizer/output-style-inlined.test<br>
llvm/test/tools/llvm-symbolizer/split-dwarf.test<br>
llvm/test/tools/llvm-symbolizer/untag-addresses.test<br>
llvm/tools/llvm-symbolizer/CMakeLists.txt<br>
llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff --git a/llvm/docs/CommandGuide/llvm-symbolizer.rst b/llvm/docs/CommandGuide/llvm-symbolizer.rst<br>
index 5c8465af04a7..5c6a9511353c 100644<br>
--- a/llvm/docs/CommandGuide/llvm-symbolizer.rst<br>
+++ b/llvm/docs/CommandGuide/llvm-symbolizer.rst<br>
@@ -220,16 +220,16 @@ OPTIONS<br>
<br>
Show help and usage for this command.<br>
<br>
-.. option:: --help-list<br>
-<br>
- Show help and usage for this command without grouping the options into categories.<br>
-<br>
.. _llvm-symbolizer-opt-i:<br>
<br>
.. option:: --inlining, --inlines, -i<br>
<br>
If a source code location is in an inlined function, prints all the inlined<br>
- frames. Defaults to true.<br>
+ frames. This is the default.<br>
+<br>
+.. option:: --no-inlines<br>
+<br>
+ Don't print inlined frames.<br>
<br>
.. option:: --no-demangle<br>
<br>
@@ -267,17 +267,17 @@ OPTIONS<br>
<br>
foo() at /tmp/test.cpp:6:3<br>
<br>
- $ llvm-symbolizer --output-style=LLVM --obj=inlined.elf 0x4004be 0x400486 -p -i=0<br>
+ $ llvm-symbolizer --output-style=LLVM --obj=inlined.elf 0x4004be <br>
+ 0x400486 -p --no-inlines<br>
main at /tmp/test.cpp:11:18<br>
<br>
foo() at /tmp/test.cpp:6:3<br>
<br>
- $ llvm-symbolizer --output-style=GNU --obj=inlined.elf 0x4004be 0x400486 -p -i=0<br>
+ $ llvm-symbolizer --output-style=GNU --obj=inlined.elf 0x4004be <br>
+ 0x400486 -p --no-inlines<br>
baz() at /tmp/test.cpp:11<br>
foo() at /tmp/test.cpp:6<br>
<br>
$ clang -g -fdebug-info-for-profiling test.cpp -o profiling.elf<br>
- $ llvm-symbolizer --output-style=GNU --obj=profiling.elf 0x401167 -p -i=0<br>
+ $ llvm-symbolizer --output-style=GNU --obj=profiling.elf 0x401167 <br>
+ -p --no-inlines<br>
main at /tmp/test.cpp:15 (discriminator 2)<br>
<br>
.. option:: --pretty-print, -p<br>
<br>
diff --git a/llvm/include/llvm/Option/OptTable.h b/llvm/include/llvm/Option/OptTable.h<br>
index b9984bed55a7..1aabff0fd659 100644<br>
--- a/llvm/include/llvm/Option/OptTable.h<br>
+++ b/llvm/include/llvm/Option/OptTable.h<br>
@@ -13,6 +13,7 @@<br>
#include "llvm/ADT/StringRef.h"<br>
#include "llvm/ADT/StringSet.h"<br>
#include "llvm/Option/OptSpecifier.h"<br>
+#include "llvm/Support/StringSaver.h"<br>
#include <cassert><br>
#include <string><br>
#include <vector><br>
@@ -20,6 +21,7 @@<br>
namespace llvm {<br>
<br>
class raw_ostream;<br>
+template <typename Fn> class function_ref;<br>
<br>
namespace opt {<br>
<br>
@@ -60,6 +62,7 @@ class OptTable {<br>
std::vector<Info> OptionInfos;<br>
bool IgnoreCase;<br>
bool GroupedShortOptions = false;<br>
+ const char *EnvVar = nullptr;<br>
<br>
unsigned TheInputOptionID = 0;<br>
unsigned TheUnknownOptionID = 0;<br>
@@ -123,6 +126,9 @@ class OptTable {<br>
return getInfo(id).MetaVar;<br>
}<br>
<br>
+ /// Specify the environment variable where initial options should be read.<br>
+ void setInitialOptionsFromEnvironment(const char *E) { EnvVar = E; }<br>
+<br>
/// Support grouped short options. e.g. -ab represents -a -b.<br>
void setGroupedShortOptions(bool Value) { GroupedShortOptions = Value; }<br>
<br>
@@ -219,6 +225,18 @@ class OptTable {<br>
unsigned &MissingArgCount, unsigned FlagsToInclude = 0,<br>
unsigned FlagsToExclude = 0) const;<br>
<br>
+ /// A convenience helper which handles optional initial options <br>
+ populated from /// an environment variable, expands response files <br>
+ recursively and parses /// options.<br>
+ ///<br>
+ /// \param ErrorFn - Called on a formatted error message for missing <br>
+ arguments /// or unknown options.<br>
+ /// \return An InputArgList; on error this will contain all the <br>
+ options which /// could be parsed.<br>
+ InputArgList parseArgs(int Argc, char *const *Argv, OptSpecifier Unknown,<br>
+ StringSaver &Saver,<br>
+ function_ref<void(StringRef)> ErrorFn) const;<br>
+<br>
/// Render the help text for an option table.<br>
///<br>
/// \param OS - The stream to write the help text to.<br>
<br>
diff --git a/llvm/include/llvm/Support/CommandLine.h b/llvm/include/llvm/Support/CommandLine.h<br>
index 62e44aeefe9c..38c588080069 100644<br>
--- a/llvm/include/llvm/Support/CommandLine.h<br>
+++ b/llvm/include/llvm/Support/CommandLine.h<br>
@@ -2085,6 +2085,14 @@ bool ExpandResponseFiles(<br>
llvm::vfs::FileSystem &FS = *llvm::vfs::getRealFileSystem(),<br>
llvm::Optional<llvm::StringRef> CurrentDir = llvm::None);<br>
<br>
+/// A convenience helper which concatenates the options specified by <br>
+the /// environment variable EnvVar and command line options, then <br>
+expands response /// files recursively. The tokenizer is a predefined GNU or Windows one.<br>
+/// \return true if all @files were expanded successfully or there were none.<br>
+bool expandResponseFiles(int Argc, const char *const *Argv, const char *EnvVar,<br>
+ StringSaver &Saver,<br>
+ SmallVectorImpl<const char *> &NewArgv);<br>
+<br>
/// Mark all options not part of this category as cl::ReallyHidden.<br>
///<br>
/// \param Category the category of options to keep displaying<br>
<br>
diff --git a/llvm/lib/Option/OptTable.cpp b/llvm/lib/Option/OptTable.cpp index 16404d3d8107..2b7fcf55a57c 100644<br>
--- a/llvm/lib/Option/OptTable.cpp<br>
+++ b/llvm/lib/Option/OptTable.cpp<br>
@@ -6,14 +6,15 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
+#include "llvm/Option/OptTable.h"<br>
#include "llvm/ADT/STLExtras.h"<br>
#include "llvm/ADT/StringRef.h"<br>
#include "llvm/ADT/StringSet.h"<br>
#include "llvm/Option/Arg.h"<br>
#include "llvm/Option/ArgList.h"<br>
-#include "llvm/Option/Option.h"<br>
#include "llvm/Option/OptSpecifier.h"<br>
-#include "llvm/Option/OptTable.h"<br>
+#include "llvm/Option/Option.h"<br>
+#include "llvm/Support/CommandLine.h" // for expandResponseFiles<br>
#include "llvm/Support/Compiler.h"<br>
#include "llvm/Support/ErrorHandling.h"<br>
#include "llvm/Support/raw_ostream.h"<br>
@@ -490,6 +491,33 @@ InputArgList OptTable::ParseArgs(ArrayRef<const char *> ArgArr,<br>
return Args;<br>
}<br>
<br>
+InputArgList OptTable::parseArgs(int Argc, char *const *Argv,<br>
+ OptSpecifier Unknown, StringSaver &Saver,<br>
+ function_ref<void(StringRef)> ErrorFn) <br>
+const {<br>
+ SmallVector<const char *, 0> NewArgv;<br>
+ // The environment variable specifies initial options which can be <br>
+overridden<br>
+ // by commnad line options.<br>
+ cl::expandResponseFiles(Argc, Argv, EnvVar, Saver, NewArgv);<br>
+<br>
+ unsigned MAI, MAC;<br>
+ opt::InputArgList Args = ParseArgs(makeArrayRef(NewArgv), MAI, MAC); <br>
+ if (MAC)<br>
+ ErrorFn((Twine(Args.getArgString(MAI)) + ": missing <br>
+ argument").str());<br>
+<br>
+ // For each unknwon option, call ErrorFn with a formatted error <br>
+message. The<br>
+ // message includes a suggested alternative option spelling if available.<br>
+ std::string Nearest;<br>
+ for (const opt::Arg *A : Args.filtered(Unknown)) {<br>
+ std::string Spelling = A->getAsString(Args);<br>
+ if (findNearest(Spelling, Nearest) > 1)<br>
+ ErrorFn("unknown argument '" + A->getAsString(Args) + "'");<br>
+ else<br>
+ ErrorFn("unknown argument '" + A->getAsString(Args) +<br>
+ "', did you mean '" + Nearest + "'?");<br>
+ }<br>
+ return Args;<br>
+}<br>
+<br>
static std::string getOptionHelpName(const OptTable &Opts, OptSpecifier Id) {<br>
const Option O = Opts.getOption(Id);<br>
std::string Name = O.getPrefixedName();<br>
<br>
diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp<br>
index 4fba6a9ada2c..e53421a277f1 100644<br>
--- a/llvm/lib/Support/CommandLine.cpp<br>
+++ b/llvm/lib/Support/CommandLine.cpp<br>
@@ -1251,6 +1251,22 @@ bool cl::ExpandResponseFiles(StringSaver &Saver, TokenizerCallback Tokenizer,<br>
return AllExpanded;<br>
}<br>
<br>
+bool cl::expandResponseFiles(int Argc, const char *const *Argv,<br>
+ const char *EnvVar, StringSaver &Saver,<br>
+ SmallVectorImpl<const char *> &NewArgv) {<br>
+ auto Tokenize = Triple(sys::getProcessTriple()).isOSWindows()<br>
+ ? cl::TokenizeWindowsCommandLine<br>
+ : cl::TokenizeGNUCommandLine;<br>
+ // The environment variable specifies initial options.<br>
+ if (EnvVar)<br>
+ if (llvm::Optional<std::string> EnvValue = sys::Process::GetEnv(EnvVar))<br>
+ Tokenize(*EnvValue, Saver, NewArgv, /*MarkEOLs=*/false);<br>
+<br>
+ // Command line options can override the environment variable.<br>
+ NewArgv.append(Argv + 1, Argv + Argc);<br>
+ return ExpandResponseFiles(Saver, Tokenize, NewArgv); }<br>
+<br>
bool cl::readConfigFile(StringRef CfgFile, StringSaver &Saver,<br>
SmallVectorImpl<const char *> &Argv) {<br>
SmallString<128> AbsPath;<br>
<br>
diff --git a/llvm/test/DebugInfo/debuglineinfo-path.ll b/llvm/test/DebugInfo/debuglineinfo-path.ll<br>
index 4c5f43aa03fc..ea32aecf5d86 100644<br>
--- a/llvm/test/DebugInfo/debuglineinfo-path.ll<br>
+++ b/llvm/test/DebugInfo/debuglineinfo-path.ll<br>
@@ -8,9 +8,9 @@<br>
; RUN: llvm-nm --radix=o %t | grep posix_absolute_func > %t.posix_absolute_func ; RUN: llvm-nm --radix=o %t | grep posix_relative_func > %t.posix_relative_func ; RUN: llvm-nm --radix=o %t | grep win_func > %t.win_func -; RUN: llvm-symbolizer --functions=linkage
--inlining --demangle=false --obj %t < %t.posix_absolute_func | FileCheck %s --check-prefix=POSIX_A -; RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false --obj %t < %t.posix_relative_func | FileCheck %s --check-prefix=POSIX_R -; RUN: llvm-symbolizer
--functions=linkage --inlining --demangle=false --obj %t < %t.win_func | FileCheck %s --check-prefix=WIN<br>
+; RUN: llvm-symbolizer --functions=linkage --inlining --no-demangle <br>
+--obj %t < %t.posix_absolute_func | FileCheck %s --check-prefix=POSIX_A <br>
+; RUN: llvm-symbolizer --functions=linkage --inlining --no-demangle <br>
+--obj %t < %t.posix_relative_func | FileCheck %s --check-prefix=POSIX_R <br>
+; RUN: llvm-symbolizer --functions=linkage --inlining --no-demangle <br>
+--obj %t < %t.win_func | FileCheck %s --check-prefix=WIN<br>
<br>
;POSIX_A: posix_absolute_func<br>
;POSIX_A: /absolute/posix/path{{[\/]}}posix.c<br>
<br>
diff --git a/llvm/test/tools/llvm-symbolizer/basic.s b/llvm/test/tools/llvm-symbolizer/basic.s<br>
index b9d5c814024f..1a28f14f3eb4 100644<br>
--- a/llvm/test/tools/llvm-symbolizer/basic.s<br>
+++ b/llvm/test/tools/llvm-symbolizer/basic.s<br>
@@ -17,6 +17,7 @@ foo:<br>
<br>
# Check --obj aliases --exe, -e<br>
# RUN: llvm-symbolizer 0xa 0xb --exe=%t.o | FileCheck %s<br>
+# RUN: llvm-symbolizer 0xa 0xb --exe %t.o | FileCheck %s<br>
# RUN: llvm-symbolizer 0xa 0xb -e %t.o | FileCheck %s # RUN: llvm-symbolizer 0xa 0xb -e=%t.o | FileCheck %s # RUN: llvm-symbolizer 0xa 0xb -e%t.o | FileCheck %s<br>
<br>
diff --git a/llvm/test/tools/llvm-symbolizer/help.test b/llvm/test/tools/llvm-symbolizer/help.test<br>
index 12339463631c..c05760f61866 100644<br>
--- a/llvm/test/tools/llvm-symbolizer/help.test<br>
+++ b/llvm/test/tools/llvm-symbolizer/help.test<br>
@@ -4,9 +4,9 @@ RUN: llvm-addr2line -h | FileCheck %s --check-prefix=ADDR2LINE<br>
RUN: llvm-addr2line --help | FileCheck %s --check-prefix=ADDR2LINE<br>
<br>
SYMBOLIZER: OVERVIEW: llvm-symbolizer<br>
-SYMBOLIZER: USAGE: llvm-symbolizer{{(.exe)?}} [options] <input addresses>...<br>
+SYMBOLIZER: USAGE: llvm-symbolizer{{(.exe)?}} [options] addresses...<br>
SYMBOLIZER: @FILE<br>
<br>
ADDR2LINE: OVERVIEW: llvm-addr2line<br>
-ADDR2LINE: USAGE: llvm-addr2line{{(.exe)?}} [options] <input addresses>...<br>
+ADDR2LINE: USAGE: llvm-addr2line{{(.exe)?}} [options] addresses...<br>
ADDR2LINE: @FILE<br>
<br>
diff --git a/llvm/test/tools/llvm-symbolizer/output-style-inlined.test b/llvm/test/tools/llvm-symbolizer/output-style-inlined.test<br>
index 7aa9c6b4059b..daa9584a3f48 100644<br>
--- a/llvm/test/tools/llvm-symbolizer/output-style-inlined.test<br>
+++ b/llvm/test/tools/llvm-symbolizer/output-style-inlined.test<br>
@@ -1,16 +1,16 @@<br>
-This test checks that when inlined frames are not shown (-i=0) and the output<br>
+This test checks that when inlined frames are not shown (--no-inlines) <br>
+and the output<br>
style is set to GNU (--output-style=GNU) the name of an inlined function is not replaced with the name of the top caller function. At the same time, the current behavior of llvm-symbolizer is preserved with --output-style=LLVM or when the option is not
specified.<br>
<br>
-RUN: llvm-symbolizer -i=0 -e %p/Inputs/addr.exe 0x40054d \<br>
+RUN: llvm-symbolizer --no-inlines -e %p/Inputs/addr.exe 0x40054d \<br>
RUN: | FileCheck %s --check-prefix=LLVM --implicit-check-not=inctwo<br>
<br>
-RUN: llvm-symbolizer --output-style=LLVM -i=0 -e %p/Inputs/addr.exe 0x40054d \<br>
+RUN: llvm-symbolizer --output-style=LLVM --no-inlines -e <br>
+%p/Inputs/addr.exe 0x40054d \<br>
RUN: | FileCheck %s --check-prefix=LLVM --implicit-check-not=inctwo<br>
<br>
-RUN: llvm-symbolizer --output-style=GNU -i=0 -e %p/Inputs/addr.exe 0x40054d \<br>
+RUN: llvm-symbolizer --output-style=GNU --no-inlines -e <br>
+%p/Inputs/addr.exe 0x40054d \<br>
RUN: | FileCheck %s --check-prefix=GNU --implicit-check-not=main<br>
<br>
RUN: llvm-addr2line -f -e %p/Inputs/addr.exe 0x40054d \<br>
<br>
diff --git a/llvm/test/tools/llvm-symbolizer/split-dwarf.test b/llvm/test/tools/llvm-symbolizer/split-dwarf.test<br>
index af758acd7e09..e129d2ede3ae 100644<br>
--- a/llvm/test/tools/llvm-symbolizer/split-dwarf.test<br>
+++ b/llvm/test/tools/llvm-symbolizer/split-dwarf.test<br>
@@ -4,14 +4,14 @@ RUN: mkdir -p %t<br>
RUN: cp %p/Inputs/split-dwarf-test.dwo %t<br>
<br>
RUN: cd %t<br>
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \<br>
+RUN: llvm-symbolizer --functions=linkage --inlining --no-demangle \<br>
RUN: --obj=%p/Inputs/split-dwarf-test 0x400504 0x4004f4 | FileCheck --check-prefixes=SPLIT,DWO %s<br>
<br>
Ensure we get the same results in the absence of gmlt-like data in the executable but the presence of a .dwo file<br>
<br>
RUN: echo "%p/Inputs/split-dwarf-test-nogmlt 0x400504" >> %t.input<br>
RUN: echo "%p/Inputs/split-dwarf-test-nogmlt 0x4004f4" >> %t.input<br>
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \<br>
+RUN: llvm-symbolizer --functions=linkage --inlining --no-demangle \<br>
RUN: --default-arch=i386 --obj=%p/Inputs/split-dwarf-test-nogmlt 0x400504 0x4004f4 | FileCheck --check-prefixes=SPLIT,DWO %s<br>
<br>
Ensure we get gmlt like results in the absence of a .dwo file but the presence of gmlt-like data in the executable @@ -19,7 +19,7 @@ Ensure we get gmlt like results in the absence of a .dwo file but the presence o<br>
RUN: rm %t/split-dwarf-test.dwo<br>
RUN: echo "%p/Inputs/split-dwarf-test 0x400504" >> %t.input<br>
RUN: echo "%p/Inputs/split-dwarf-test 0x4004f4" >> %t.input<br>
-RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \<br>
+RUN: llvm-symbolizer --functions=linkage --inlining --no-demangle \<br>
RUN: --default-arch=i386 --obj=%p/Inputs/split-dwarf-test 0x400504 0x4004f4 | FileCheck --check-prefixes=SPLIT,NODWO %s<br>
<br>
DWO: _Z2f2v<br>
<br>
diff --git a/llvm/test/tools/llvm-symbolizer/unknown-argument.test b/llvm/test/tools/llvm-symbolizer/unknown-argument.test<br>
new file mode 100644<br>
index 000000000000..a697f1a27626<br>
--- /dev/null<br>
+++ b/llvm/test/tools/llvm-symbolizer/unknown-argument.test<br>
@@ -0,0 +1,12 @@<br>
+# RUN: not llvm-symbolizer -x --flag 2>&1 | FileCheck %s<br>
+<br>
+# CHECK: error: unknown argument '-x'{{$}}<br>
+# CHECK-NEXT: error: unknown argument '--flag'{{$}}<br>
+<br>
+# RUN: not llvm-symbolizer --inline 2>&1 | FileCheck %s <br>
+--check-prefix=SUGGEST<br>
+<br>
+# SUGGEST: error: unknown argument '--inline', did you mean '--inlines'?<br>
+<br>
+# RUN: not llvm-symbolizer -e 2>&1 | FileCheck %s <br>
+--check-prefix=MISSING<br>
+<br>
+# MISSING: error: -e: missing argument<br>
<br>
diff --git a/llvm/test/tools/llvm-symbolizer/untag-addresses.test b/llvm/test/tools/llvm-symbolizer/untag-addresses.test<br>
index 3799f306cab0..f37f257d2d21 100644<br>
--- a/llvm/test/tools/llvm-symbolizer/untag-addresses.test<br>
+++ b/llvm/test/tools/llvm-symbolizer/untag-addresses.test<br>
@@ -2,7 +2,7 @@<br>
<br>
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o # RUN: echo DATA %t.o 0 | llvm-symbolizer | FileCheck --check-prefix=UNTAG %s -# RUN: echo DATA %t.o 0 | llvm-symbolizer -untag-addresses=0 | FileCheck --check-prefix=NOUNTAG %s<br>
+# RUN: echo DATA %t.o 0 | llvm-symbolizer --no-untag-addresses | <br>
+FileCheck --check-prefix=NOUNTAG %s<br>
# RUN: echo DATA %t.o 0 | llvm-addr2line | FileCheck --check-prefix=NOUNTAG %s<br>
<br>
# UNTAG: foo<br>
<br>
diff --git a/llvm/tools/llvm-symbolizer/CMakeLists.txt b/llvm/tools/llvm-symbolizer/CMakeLists.txt<br>
index 13da12fba7b5..c112e344da7e 100644<br>
--- a/llvm/tools/llvm-symbolizer/CMakeLists.txt<br>
+++ b/llvm/tools/llvm-symbolizer/CMakeLists.txt<br>
@@ -3,17 +3,24 @@<br>
# This means that we need LLVM libraries to be compiled for these # targets as well. Currently, there is no support for such a build strategy.<br>
<br>
+set(LLVM_TARGET_DEFINITIONS Opts.td)<br>
+tablegen(LLVM Opts.inc -gen-opt-parser-defs)<br>
+add_public_tablegen_target(SymbolizerOptsTableGen)<br>
+<br>
set(LLVM_LINK_COMPONENTS<br>
DebugInfoDWARF<br>
DebugInfoPDB<br>
Demangle<br>
Object<br>
+ Option<br>
Support<br>
Symbolize<br>
)<br>
<br>
add_llvm_tool(llvm-symbolizer<br>
llvm-symbolizer.cpp<br>
+ DEPENDS<br>
+ SymbolizerOptsTableGen<br>
)<br>
<br>
add_llvm_tool_symlink(llvm-addr2line llvm-symbolizer)<br>
<br>
diff --git a/llvm/tools/llvm-symbolizer/Opts.td b/llvm/tools/llvm-symbolizer/Opts.td<br>
new file mode 100644<br>
index 000000000000..d83b796635b8<br>
--- /dev/null<br>
+++ b/llvm/tools/llvm-symbolizer/Opts.td<br>
@@ -0,0 +1,60 @@<br>
+include "llvm/Option/OptParser.td"<br>
+<br>
+multiclass B<string name, string help1, string help2> {<br>
+ def NAME: Flag<["--", "-"], name>, HelpText<help1>;<br>
+ def no_ # NAME: Flag<["--", "-"], "no-" # name>, HelpText<help2>; }<br>
+<br>
+multiclass Eq<string name, string help> {<br>
+ def NAME #_EQ : Joined<["--", "-"], name #"=">,<br>
+ HelpText<help>;<br>
+ def : Separate<["--", "-"], name>, Alias<!cast<Joined>(NAME #_EQ)>; }<br>
+<br>
+class F<string name, string help>: Flag<["--", "-"], name>, <br>
+HelpText<help>;<br>
+<br>
+def addresses : F<"addresses", "Show address before line information">; <br>
+defm adjust_vma<br>
+ : Eq<"adjust-vma", "Add specified offset to object file addresses">,<br>
+ MetaVarName<"<offset>">;<br>
+def basenames : Flag<["--"], "basenames">, HelpText<"Strip directory <br>
+names from paths">; defm debug_file_directory : <br>
+Eq<"debug-file-directory", "Path to directory where to look for debug <br>
+files">, MetaVarName<"<dir>">; defm default_arch : Eq<"default-arch", <br>
+"Default architecture (for multi-arch objects)">; defm demangle : <br>
+B<"demangle", "Demangle function names", "Don't demangle function <br>
+names">; def functions : F<"functions", "Print function name for a <br>
+given address">; def functions_EQ : Joined<["--"], "functions=">, <br>
+HelpText<"Print function name for a given address">, <br>
+Values<"none,short,linkage">; def help : F<"help", "Display this <br>
+help">; defm dwp : Eq<"dwp", "Path to DWP file to be use for any split CUs">, MetaVarName<"<file>">; defm dsym_hint : Eq<"dsym-hint", "Path to .dSYM bundles to search for debug info for the object files">, MetaVarName<"<dir>">; defm fallback_debug_path : Eq<"fallback-debug-path",
"Fallback path for debug binaries">, MetaVarName<"<dir>">; defm inlines : B<"inlines", "Print all inlined frames for a given address",<br>
+ "Do not print inlined frames">; defm obj<br>
+ : Eq<"obj", "Path to object file to be symbolized (if not provided, "<br>
+ "object file should be specified for each input <br>
+line)">, MetaVarName<"<file>">; defm output_style<br>
+ : Eq<"output-style", "Specify print style. Supported styles: LLVM, GNU">,<br>
+ MetaVarName<"style">,<br>
+ Values<"LLVM,GNU">;<br>
+def pretty_print : F<"pretty-print", "Make the output more human <br>
+friendly">; defm print_source_context_lines : <br>
+Eq<"print-source-context-lines", "Print N lines of source file <br>
+context">; def relative_address : F<"relative-address", "Interpret <br>
+addresses as addresses relative to the image base">; def relativenames <br>
+: F<"relativenames", "Strip the compilation directory from paths">; <br>
+defm untag_addresses : B<"untag-addresses", "", "Remove memory tags <br>
+from addresses before symbolization">; def use_native_pdb_reader : <br>
+F<"use-native-pdb-reader", "Use native PDB functionality">; def verbose <br>
+: F<"verbose", "Print verbose line info">;<br>
+<br>
+def : Flag<["-"], "a">, Alias<addresses>, HelpText<"Alias for <br>
+--addresses">; def : F<"print-address", "Alias for --addresses">, <br>
+Alias<addresses>; def : Flag<["-"], "C">, Alias<demangle>, <br>
+HelpText<"Alias for --demangle">; def : Joined<["--"], "exe=">, <br>
+Alias<obj_EQ>, HelpText<"Alias for --obj">, MetaVarName<"<file>">; def <br>
+: Separate<["--"], "exe">, Alias<obj_EQ>, HelpText<"Alias for --obj">, <br>
+MetaVarName<"<file>">; def : JoinedOrSeparate<["-"], "e">, <br>
+Alias<obj_EQ>, HelpText<"Alias for --obj">, MetaVarName<"<file>">; def <br>
+: Joined<["-"], "e=">, Alias<obj_EQ>, HelpText<"Alias for --obj">, <br>
+MetaVarName<"<file>">; def : Flag<["-"], "f">, Alias<functions>, <br>
+HelpText<"Alias for --functions">; def : Joined<["-"], "f=">, <br>
+Alias<functions_EQ>, HelpText<"Alias for --functions=">; def : <br>
+Flag<["-"], "h">, Alias<help>; def : Flag<["-"], "i">, Alias<inlines>, <br>
+HelpText<"Alias for --inlines">; def : F<"inlining", "Alias for <br>
+--inlines">, Alias<inlines>; def : Flag<["-"], "p">, <br>
+Alias<pretty_print>, HelpText<"Alias for --pretty-print">; def : <br>
+Flag<["-"], "s">, Alias<basenames>, HelpText<"Alias for --basenames">;<br>
<br>
diff --git a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp<br>
index 6a702c64a105..2101d645dffa 100644<br>
--- a/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp<br>
+++ b/llvm/tools/llvm-symbolizer/llvm-symbolizer.cpp<br>
@@ -14,15 +14,20 @@<br>
//<br>
//===----------------------------------------------------------------------===//<br>
<br>
+#include "Opts.inc"<br>
#include "llvm/ADT/StringRef.h"<br>
#include "llvm/DebugInfo/Symbolize/DIPrinter.h"<br>
#include "llvm/DebugInfo/Symbolize/Symbolize.h"<br>
+#include "llvm/Option/Arg.h"<br>
+#include "llvm/Option/ArgList.h"<br>
+#include "llvm/Option/Option.h"<br>
#include "llvm/Support/COM.h"<br>
#include "llvm/Support/CommandLine.h"<br>
#include "llvm/Support/Debug.h"<br>
#include "llvm/Support/FileSystem.h"<br>
#include "llvm/Support/InitLLVM.h"<br>
#include "llvm/Support/Path.h"<br>
+#include "llvm/Support/StringSaver.h"<br>
#include "llvm/Support/raw_ostream.h"<br>
#include <algorithm><br>
#include <cstdio><br>
@@ -32,144 +37,42 @@<br>
using namespace llvm;<br>
using namespace symbolize;<br>
<br>
-static cl::opt<bool><br>
-ClUseSymbolTable("use-symbol-table", cl::init(true),<br>
- cl::desc("Prefer names in symbol table to names "<br>
- "in debug info"));<br>
-<br>
-static cl::opt<FunctionNameKind> ClPrintFunctions(<br>
- "functions", cl::init(FunctionNameKind::LinkageName),<br>
- cl::desc("Print function name for a given address"), cl::ValueOptional,<br>
- cl::values(clEnumValN(FunctionNameKind::None, "none", "omit function name"),<br>
- clEnumValN(FunctionNameKind::ShortName, "short",<br>
- "print short function name"),<br>
- clEnumValN(FunctionNameKind::LinkageName, "linkage",<br>
- "print function linkage name"),<br>
- // Sentinel value for unspecified value.<br>
- clEnumValN(FunctionNameKind::LinkageName, "", "")));<br>
-static cl::alias ClPrintFunctionsShort("f", cl::desc("Alias for -functions"),<br>
- cl::NotHidden, cl::Grouping,<br>
- cl::aliasopt(ClPrintFunctions));<br>
-<br>
-static cl::opt<bool><br>
- ClUseRelativeAddress("relative-address", cl::init(false),<br>
- cl::desc("Interpret addresses as relative addresses"),<br>
- cl::ReallyHidden);<br>
-<br>
-static cl::opt<bool> ClUntagAddresses(<br>
- "untag-addresses", cl::init(true),<br>
- cl::desc("Remove memory tags from addresses before symbolization"));<br>
-<br>
-static cl::opt<bool><br>
- ClPrintInlining("inlining", cl::init(true),<br>
- cl::desc("Print all inlined frames for a given address"));<br>
-static cl::alias<br>
- ClPrintInliningAliasI("i", cl::desc("Alias for -inlining"),<br>
- cl::NotHidden, cl::aliasopt(ClPrintInlining),<br>
- cl::Grouping);<br>
-static cl::alias<br>
- ClPrintInliningAliasInlines("inlines", cl::desc("Alias for -inlining"),<br>
- cl::NotHidden, cl::aliasopt(ClPrintInlining));<br>
-<br>
-static cl::opt<bool> ClBasenames("basenames", cl::init(false),<br>
- cl::desc("Strip directory names from paths"));<br>
-static cl::alias ClBasenamesShort("s", cl::desc("Alias for -basenames"),<br>
- cl::NotHidden, cl::aliasopt(ClBasenames));<br>
-<br>
-static cl::opt<bool><br>
- ClRelativenames("relativenames", cl::init(false),<br>
- cl::desc("Strip the compilation directory from paths"));<br>
-<br>
-static cl::opt<bool><br>
-ClDemangle("demangle", cl::init(true), cl::desc("Demangle function names")); -static cl::alias -ClDemangleShort("C", cl::desc("Alias for -demangle"),<br>
- cl::NotHidden, cl::aliasopt(ClDemangle), cl::Grouping);<br>
-static cl::opt<bool><br>
-ClNoDemangle("no-demangle", cl::init(false),<br>
- cl::desc("Don't demangle function names"));<br>
-<br>
-static cl::opt<std::string> ClDefaultArch("default-arch", cl::init(""),<br>
- cl::desc("Default architecture "<br>
- "(for multi-arch objects)"));<br>
-<br>
-static cl::opt<std::string><br>
-ClBinaryName("obj", cl::init(""),<br>
- cl::desc("Path to object file to be symbolized (if not provided, "<br>
- "object file should be specified for each input line)"));<br>
-static cl::alias<br>
-ClBinaryNameAliasExe("exe", cl::desc("Alias for -obj"),<br>
- cl::NotHidden, cl::aliasopt(ClBinaryName));<br>
-static cl::alias ClBinaryNameAliasE("e", cl::desc("Alias for -obj"),<br>
- cl::NotHidden, cl::Grouping, cl::Prefix,<br>
- cl::aliasopt(ClBinaryName));<br>
-<br>
-static cl::opt<std::string><br>
- ClDwpName("dwp", cl::init(""),<br>
- cl::desc("Path to DWP file to be use for any split CUs"));<br>
-<br>
-static cl::list<std::string><br>
-ClDsymHint("dsym-hint", cl::ZeroOrMore,<br>
- cl::desc("Path to .dSYM bundles to search for debug info for the "<br>
- "object files"));<br>
-<br>
-static cl::opt<bool><br>
-ClPrintAddress("print-address", cl::init(false),<br>
- cl::desc("Show address before line information"));<br>
-static cl::alias<br>
-ClPrintAddressAliasAddresses("addresses", cl::desc("Alias for -print-address"),<br>
- cl::NotHidden, cl::aliasopt(ClPrintAddress));<br>
-static cl::alias<br>
-ClPrintAddressAliasA("a", cl::desc("Alias for -print-address"),<br>
- cl::NotHidden, cl::aliasopt(ClPrintAddress), cl::Grouping);<br>
-<br>
-static cl::opt<bool><br>
- ClPrettyPrint("pretty-print", cl::init(false),<br>
- cl::desc("Make the output more human friendly"));<br>
-static cl::alias ClPrettyPrintShort("p", cl::desc("Alias for -pretty-print"),<br>
- cl::NotHidden,<br>
- cl::aliasopt(ClPrettyPrint), cl::Grouping);<br>
-<br>
-static cl::opt<int> ClPrintSourceContextLines(<br>
- "print-source-context-lines", cl::init(0),<br>
- cl::desc("Print N number of source file context"));<br>
+namespace {<br>
+enum ID {<br>
+ OPT_INVALID = 0, // This is not an option ID.<br>
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \<br>
+ HELPTEXT, METAVAR, VALUES) \<br>
+ OPT_##ID,<br>
+#include "Opts.inc"<br>
+#undef OPTION<br>
+};<br>
<br>
-static cl::opt<bool> ClVerbose("verbose", cl::init(false),<br>
- cl::desc("Print verbose line info"));<br>
+#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE; #include <br>
+"Opts.inc"<br>
+#undef PREFIX<br>
+<br>
+static const opt::OptTable::Info InfoTable[] = { #define OPTION(PREFIX, <br>
+NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \<br>
+ HELPTEXT, METAVAR, VALUES) \<br>
+ { \<br>
+ PREFIX, NAME, HELPTEXT, \<br>
+ METAVAR, OPT_##ID, opt::Option::KIND##Class, \<br>
+ PARAM, FLAGS, OPT_##GROUP, \<br>
+ OPT_##ALIAS, ALIASARGS, VALUES},<br>
+#include "Opts.inc"<br>
+#undef OPTION<br>
+};<br>
<br>
-static cl::opt<uint64_t><br>
- ClAdjustVMA("adjust-vma", cl::init(0), cl::value_desc("offset"),<br>
- cl::desc("Add specified offset to object file addresses"));<br>
+class SymbolizerOptTable : public opt::OptTable {<br>
+public:<br>
+ SymbolizerOptTable() : OptTable(InfoTable, true) {} }; } // namespace<br>
<br>
static cl::list<std::string> ClInputAddresses(cl::Positional,<br>
cl::desc("<input addresses>..."),<br>
cl::ZeroOrMore);<br>
<br>
-static cl::opt<std::string><br>
- ClFallbackDebugPath("fallback-debug-path", cl::init(""),<br>
- cl::desc("Fallback path for debug binaries."));<br>
-<br>
-static cl::list<std::string><br>
- ClDebugFileDirectory("debug-file-directory", cl::ZeroOrMore,<br>
- cl::value_desc("dir"),<br>
- cl::desc("Path to directory where to look for debug "<br>
- "files."));<br>
-<br>
-static cl::opt<DIPrinter::OutputStyle><br>
- ClOutputStyle("output-style", cl::init(DIPrinter::OutputStyle::LLVM),<br>
- cl::desc("Specify print style"),<br>
- cl::values(clEnumValN(DIPrinter::OutputStyle::LLVM, "LLVM",<br>
- "LLVM default style"),<br>
- clEnumValN(DIPrinter::OutputStyle::GNU, "GNU",<br>
- "GNU addr2line style")));<br>
-<br>
-static cl::opt<bool><br>
- ClUseNativePDBReader("use-native-pdb-reader", cl::init(0),<br>
- cl::desc("Use native PDB functionality"));<br>
-<br>
-static cl::extrahelp<br>
- HelpResponse("\nPass @FILE as argument to read options from FILE.\n");<br>
-<br>
template<typename T><br>
static bool error(Expected<T> &ResOrErr) {<br>
if (ResOrErr)<br>
@@ -185,7 +88,8 @@ enum class Command {<br>
Frame,<br>
};<br>
<br>
-static bool parseCommand(bool IsAddr2Line, StringRef InputString, Command &Cmd,<br>
+static bool parseCommand(StringRef BinaryName, bool IsAddr2Line,<br>
+ StringRef InputString, Command &Cmd,<br>
std::string &ModuleName, uint64_t &ModuleOffset) {<br>
const char kDelimiters[] = " \n\r";<br>
ModuleName = "";<br>
@@ -201,7 +105,7 @@ static bool parseCommand(bool IsAddr2Line, StringRef InputString, Command &Cmd,<br>
}<br>
const char *Pos = InputString.data();<br>
// Skip delimiters and parse input filename (if needed).<br>
- if (ClBinaryName.empty()) {<br>
+ if (BinaryName.empty()) {<br>
Pos += strspn(Pos, kDelimiters);<br>
if (*Pos == '"' || *Pos == '\'') {<br>
char Quote = *Pos;<br>
@@ -217,7 +121,7 @@ static bool parseCommand(bool IsAddr2Line, StringRef InputString, Command &Cmd,<br>
Pos += NameLength;<br>
}<br>
} else {<br>
- ModuleName = ClBinaryName;<br>
+ ModuleName = BinaryName.str();<br>
}<br>
// Skip delimiters and parse module offset.<br>
Pos += strspn(Pos, kDelimiters);<br>
@@ -230,24 +134,26 @@ static bool parseCommand(bool IsAddr2Line, StringRef InputString, Command &Cmd,<br>
return !Offset.getAsInteger(IsAddr2Line ? 16 : 0, ModuleOffset); }<br>
<br>
-static void symbolizeInput(bool IsAddr2Line, StringRef InputString,<br>
- LLVMSymbolizer &Symbolizer, DIPrinter &Printer) {<br>
+static void symbolizeInput(const opt::InputArgList &Args, uint64_t AdjustVMA,<br>
+ bool IsAddr2Line, DIPrinter::OutputStyle OutputStyle,<br>
+ StringRef InputString, LLVMSymbolizer &Symbolizer,<br>
+ DIPrinter &Printer) {<br>
Command Cmd;<br>
std::string ModuleName;<br>
uint64_t Offset = 0;<br>
- if (!parseCommand(IsAddr2Line, StringRef(InputString), Cmd, ModuleName,<br>
- Offset)) {<br>
+ if (!parseCommand(Args.getLastArgValue(OPT_obj_EQ), IsAddr2Line,<br>
+ StringRef(InputString), Cmd, ModuleName, Offset)) {<br>
outs() << InputString << "\n";<br>
return;<br>
}<br>
<br>
- if (ClPrintAddress) {<br>
+ if (Args.hasArg(OPT_addresses)) {<br>
outs() << "0x";<br>
outs().write_hex(Offset);<br>
- StringRef Delimiter = ClPrettyPrint ? ": " : "\n";<br>
+ StringRef Delimiter = Args.hasArg(OPT_pretty_print) ? ": " : "\n";<br>
outs() << Delimiter;<br>
}<br>
- Offset -= ClAdjustVMA;<br>
+ Offset -= AdjustVMA;<br>
if (Cmd == Command::Data) {<br>
auto ResOrErr = Symbolizer.symbolizeData(<br>
ModuleName, {Offset, object::SectionedAddress::UndefSection});<br>
@@ -261,13 +167,13 @@ static void symbolizeInput(bool IsAddr2Line, StringRef InputString,<br>
if (ResOrErr->empty())<br>
outs() << "??\n";<br>
}<br>
- } else if (ClPrintInlining) {<br>
+ } else if (Args.hasFlag(OPT_inlines, OPT_no_inlines, !IsAddr2Line)) {<br>
auto ResOrErr = Symbolizer.symbolizeInlinedCode(<br>
ModuleName, {Offset, object::SectionedAddress::UndefSection});<br>
Printer << (error(ResOrErr) ? DIInliningInfo() : ResOrErr.get());<br>
- } else if (ClOutputStyle == DIPrinter::OutputStyle::GNU) {<br>
- // With ClPrintFunctions == FunctionNameKind::LinkageName (default)<br>
- // and ClUseSymbolTable == true (also default), Symbolizer.symbolizeCode()<br>
+ } else if (OutputStyle == DIPrinter::OutputStyle::GNU) {<br>
+ // With PrintFunctions == FunctionNameKind::LinkageName (default)<br>
+ // and UseSymbolTable == true (also default), <br>
+ Symbolizer.symbolizeCode()<br>
// may override the name of an inlined function with the name of the topmost<br>
// caller function in the inlining chain. This contradicts the existing<br>
// behavior of addr2line. Symbolizer.symbolizeInlinedCode() overrides only @@ -280,67 +186,131 @@ static void symbolizeInput(bool IsAddr2Line, StringRef InputString,<br>
ModuleName, {Offset, object::SectionedAddress::UndefSection});<br>
Printer << (error(ResOrErr) ? DILineInfo() : ResOrErr.get());<br>
}<br>
- if (ClOutputStyle == DIPrinter::OutputStyle::LLVM)<br>
+ if (OutputStyle == DIPrinter::OutputStyle::LLVM)<br>
outs() << "\n";<br>
}<br>
<br>
-int main(int argc, char **argv) {<br>
- InitLLVM X(argc, argv);<br>
+static void printHelp(bool IsAddr2Line, const SymbolizerOptTable &Tbl,<br>
+ raw_ostream &OS) {<br>
+ StringRef ToolName = IsAddr2Line ? "llvm-addr2line" : <br>
+"llvm-symbolizer";<br>
+ const char HelpText[] = " [options] addresses...";<br>
+ Tbl.PrintHelp(OS, (ToolName + HelpText).str().c_str(),<br>
+ ToolName.str().c_str());<br>
+ // TODO Replace this with OptTable API once it adds extrahelp support.<br>
+ OS << "\nPass @FILE as argument to read options from FILE.\n"; }<br>
<br>
- bool IsAddr2Line = sys::path::stem(argv[0]).contains("addr2line");<br>
+static opt::InputArgList parseOptions(int Argc, char *Argv[], bool IsAddr2Line,<br>
+ StringSaver &Saver,<br>
+ SymbolizerOptTable &Tbl) {<br>
+ Tbl.setGroupedShortOptions(true);<br>
+ // The environment variable specifies initial options which can be <br>
+overridden<br>
+ // by commnad line options.<br>
+ Tbl.setInitialOptionsFromEnvironment(IsAddr2Line ? "LLVM_ADDR2LINE_OPTS"<br>
+ : <br>
+"LLVM_SYMBOLIZER_OPTS");<br>
+ bool HasError = false;<br>
+ opt::InputArgList Args =<br>
+ Tbl.parseArgs(Argc, Argv, OPT_UNKNOWN, Saver, [&](StringRef Msg) {<br>
+ errs() << ("error: " + Msg + "\n");<br>
+ HasError = true;<br>
+ });<br>
+ if (HasError)<br>
+ exit(1);<br>
+ if (Args.hasArg(OPT_help)) {<br>
+ printHelp(IsAddr2Line, Tbl, outs());<br>
+ exit(0);<br>
+ }<br>
<br>
- if (IsAddr2Line) {<br>
- ClDemangle.setInitialValue(false);<br>
- ClPrintFunctions.setInitialValue(FunctionNameKind::None);<br>
- ClPrintInlining.setInitialValue(false);<br>
- ClUntagAddresses.setInitialValue(false);<br>
- ClOutputStyle.setInitialValue(DIPrinter::OutputStyle::GNU);<br>
+ return Args;<br>
+}<br>
+<br>
+template <typename T><br>
+static void parseIntArg(const opt::InputArgList &Args, int ID, T <br>
+&Value) {<br>
+ if (const opt::Arg *A = Args.getLastArg(ID)) {<br>
+ StringRef V(A->getValue());<br>
+ if (!llvm::to_integer(V, Value, 0)) {<br>
+ errs() << A->getSpelling() +<br>
+ ": expected a non-negative integer, but got '" + V + "'";<br>
+ exit(1);<br>
+ }<br>
+ } else {<br>
+ Value = 0;<br>
}<br>
+}<br>
+<br>
+static FunctionNameKind decideHowToPrintFunctions(const opt::InputArgList &Args,<br>
+ bool IsAddr2Line) {<br>
+ if (Args.hasArg(OPT_functions))<br>
+ return FunctionNameKind::LinkageName;<br>
+ if (const opt::Arg *A = Args.getLastArg(OPT_functions_EQ))<br>
+ return StringSwitch<FunctionNameKind>(A->getValue())<br>
+ .Case("none", FunctionNameKind::None)<br>
+ .Case("short", FunctionNameKind::ShortName)<br>
+ .Default(FunctionNameKind::LinkageName);<br>
+ return IsAddr2Line ? FunctionNameKind::None : <br>
+FunctionNameKind::LinkageName; }<br>
<br>
- llvm::sys::InitializeCOMRAII COM(llvm::sys::COMThreadingMode::MultiThreaded);<br>
- cl::ParseCommandLineOptions(<br>
- argc, argv, IsAddr2Line ? "llvm-addr2line\n" : "llvm-symbolizer\n",<br>
- /*Errs=*/nullptr,<br>
- IsAddr2Line ? "LLVM_ADDR2LINE_OPTS" : "LLVM_SYMBOLIZER_OPTS");<br>
+int main(int argc, char **argv) {<br>
+ InitLLVM X(argc, argv);<br>
+ sys::InitializeCOMRAII COM(sys::COMThreadingMode::MultiThreaded);<br>
<br>
- // If both --demangle and --no-demangle are specified then pick the last one.<br>
- if (ClNoDemangle.getPosition() > ClDemangle.getPosition())<br>
- ClDemangle = !ClNoDemangle;<br>
+ bool IsAddr2Line = sys::path::stem(argv[0]).contains("addr2line");<br>
+ BumpPtrAllocator A;<br>
+ StringSaver Saver(A);<br>
+ SymbolizerOptTable Tbl;<br>
+ opt::InputArgList Args = parseOptions(argc, argv, IsAddr2Line, Saver, <br>
+ Tbl);<br>
<br>
LLVMSymbolizer::Options Opts;<br>
- Opts.PrintFunctions = ClPrintFunctions;<br>
- Opts.UseSymbolTable = ClUseSymbolTable;<br>
- Opts.Demangle = ClDemangle;<br>
- Opts.RelativeAddresses = ClUseRelativeAddress;<br>
- Opts.UntagAddresses = ClUntagAddresses;<br>
- Opts.DefaultArch = ClDefaultArch;<br>
- Opts.FallbackDebugPath = ClFallbackDebugPath;<br>
- Opts.DWPName = ClDwpName;<br>
- Opts.DebugFileDirectory = ClDebugFileDirectory;<br>
- Opts.UseNativePDBReader = ClUseNativePDBReader;<br>
- Opts.PathStyle = DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath;<br>
- // If both --basenames and --relativenames are specified then pick the last<br>
- // one.<br>
- if (ClBasenames.getPosition() > ClRelativenames.getPosition())<br>
- Opts.PathStyle = DILineInfoSpecifier::FileLineInfoKind::BaseNameOnly;<br>
- else if (ClRelativenames)<br>
- Opts.PathStyle = DILineInfoSpecifier::FileLineInfoKind::RelativeFilePath;<br>
-<br>
- for (const auto &hint : ClDsymHint) {<br>
- if (sys::path::extension(hint) == ".dSYM") {<br>
- Opts.DsymHints.push_back(hint);<br>
+ uint64_t AdjustVMA;<br>
+ unsigned SourceContextLines;<br>
+ parseIntArg(Args, OPT_adjust_vma_EQ, AdjustVMA); if (const opt::Arg <br>
+ *A = Args.getLastArg(OPT_basenames, OPT_relativenames)) {<br>
+ Opts.PathStyle =<br>
+ A->getOption().matches(OPT_basenames)<br>
+ ? DILineInfoSpecifier::FileLineInfoKind::BaseNameOnly<br>
+ : DILineInfoSpecifier::FileLineInfoKind::RelativeFilePath;<br>
+ } else {<br>
+ Opts.PathStyle = <br>
+ DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath;<br>
+ }<br>
+ Opts.DebugFileDirectory = <br>
+ Args.getAllArgValues(OPT_debug_file_directory_EQ);<br>
+ Opts.DefaultArch = Args.getLastArgValue(OPT_default_arch_EQ).str();<br>
+ Opts.Demangle = Args.hasFlag(OPT_demangle, OPT_no_demangle, <br>
+ !IsAddr2Line); Opts.DWPName = Args.getLastArgValue(OPT_dwp_EQ).str();<br>
+ Opts.FallbackDebugPath =<br>
+ Args.getLastArgValue(OPT_fallback_debug_path_EQ).str();<br>
+ Opts.PrintFunctions = decideHowToPrintFunctions(Args, IsAddr2Line); <br>
+ parseIntArg(Args, OPT_print_source_context_lines_EQ, <br>
+ SourceContextLines); Opts.RelativeAddresses = <br>
+ Args.hasArg(OPT_relative_address);<br>
+ Opts.UntagAddresses =<br>
+ Args.hasFlag(OPT_untag_addresses, OPT_no_untag_addresses, <br>
+ !IsAddr2Line); Opts.UseNativePDBReader = <br>
+ Args.hasArg(OPT_use_native_pdb_reader);<br>
+ Opts.UseSymbolTable = true;<br>
+<br>
+ for (const opt::Arg *A : Args.filtered(OPT_dsym_hint_EQ)) {<br>
+ StringRef Hint(A->getValue());<br>
+ if (sys::path::extension(Hint) == ".dSYM") {<br>
+ Opts.DsymHints.emplace_back(Hint);<br>
} else {<br>
- errs() << "Warning: invalid dSYM hint: \"" << hint <<<br>
- "\" (must have the '.dSYM' extension).\n";<br>
+ errs() << "Warning: invalid dSYM hint: \"" << Hint<br>
+ << "\" (must have the '.dSYM' extension).\n";<br>
}<br>
}<br>
- LLVMSymbolizer Symbolizer(Opts);<br>
<br>
- DIPrinter Printer(outs(), ClPrintFunctions != FunctionNameKind::None,<br>
- ClPrettyPrint, ClPrintSourceContextLines, ClVerbose,<br>
- ClOutputStyle);<br>
+ auto OutputStyle =<br>
+ IsAddr2Line ? DIPrinter::OutputStyle::GNU : <br>
+ DIPrinter::OutputStyle::LLVM; if (const opt::Arg *A = Args.getLastArg(OPT_output_style_EQ)) {<br>
+ OutputStyle = strcmp(A->getValue(), "GNU") == 0<br>
+ ? DIPrinter::OutputStyle::GNU<br>
+ : DIPrinter::OutputStyle::LLVM; }<br>
+<br>
+ LLVMSymbolizer Symbolizer(Opts);<br>
+ DIPrinter Printer(outs(), Opts.PrintFunctions != FunctionNameKind::None,<br>
+ Args.hasArg(OPT_pretty_print), SourceContextLines,<br>
+ Args.hasArg(OPT_verbose), OutputStyle);<br>
<br>
- if (ClInputAddresses.empty()) {<br>
+ std::vector<std::string> InputAddresses = <br>
+ Args.getAllArgValues(OPT_INPUT); if (InputAddresses.empty()) {<br>
const int kMaxInputStringLength = 1024;<br>
char InputString[kMaxInputStringLength];<br>
<br>
@@ -351,12 +321,14 @@ int main(int argc, char **argv) {<br>
std::remove_if(StrippedInputString.begin(), StrippedInputString.end(),<br>
[](char c) { return c == '\r' || c == '\n'; }),<br>
StrippedInputString.end());<br>
- symbolizeInput(IsAddr2Line, StrippedInputString, Symbolizer, Printer);<br>
+ symbolizeInput(Args, AdjustVMA, IsAddr2Line, OutputStyle,<br>
+ StrippedInputString, Symbolizer, Printer);<br>
outs().flush();<br>
}<br>
} else {<br>
- for (StringRef Address : ClInputAddresses)<br>
- symbolizeInput(IsAddr2Line, Address, Symbolizer, Printer);<br>
+ for (StringRef Address : InputAddresses)<br>
+ symbolizeInput(Args, AdjustVMA, IsAddr2Line, OutputStyle, Address,<br>
+ Symbolizer, Printer);<br>
}<br>
<br>
return 0;<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><o:p></o:p></p>
</blockquote>
</div>
</div>
</div>
</body>
</html>