[pkg-d-commits] [ldc] 202/211: Refactor the machinery to add commandline options that clash with LLVM's options. This generalizes the piece of code that adds the "enable-color" option, such that it is easier to add other LLVM-clashing options (such as -ffast-math). [NFC]
Matthias Klumpp
mak at moszumanska.debian.org
Sun Apr 23 22:36:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
mak pushed a commit to annotated tag v1.1.0
in repository ldc.
commit fd7e5f22783504ef57bd0aa50919d0bc9e4eaa4f
Author: Johan Engelen <jbc.engelen at gmail.com>
Date: Tue Dec 6 20:24:45 2016 +0100
Refactor the machinery to add commandline options that clash with LLVM's options. This generalizes the piece of code that adds the "enable-color" option, such that it is easier to add other LLVM-clashing options (such as -ffast-math). [NFC]
---
driver/cl_options.cpp | 135 +++++++++++++++++++++++++++++++++++++++++++++-----
driver/cl_options.h | 5 +-
driver/main.cpp | 111 ++---------------------------------------
3 files changed, 128 insertions(+), 123 deletions(-)
diff --git a/driver/cl_options.cpp b/driver/cl_options.cpp
index 8ae233e..413ec55 100644
--- a/driver/cl_options.cpp
+++ b/driver/cl_options.cpp
@@ -424,18 +424,6 @@ cl::opt<unsigned, true> nestedTemplateDepth(
"(experimental) set maximum number of nested template instantiations"),
cl::location(global.params.nestedTmpl), cl::init(500));
-#if LDC_LLVM_VER < 307
-cl::opt<bool, true, FlagParser<bool>>
- color("color", cl::desc("Force colored console output"),
- cl::location(global.params.color));
-#else
-void CreateColorOption() {
- new cl::opt<bool, true, FlagParser<bool>>(
- "color", cl::desc("Force colored console output"),
- cl::location(global.params.color));
-}
-#endif
-
cl::opt<bool, true>
useDIP25("dip25",
cl::desc("implement http://wiki.dlang.org/DIP25 (experimental)"),
@@ -490,4 +478,127 @@ static cl::extrahelp footer(
"Options marked with (*) also have a -disable-FOO variant with inverted\n"
"meaning.\n");
+/// Create commandline options that may clash with LLVM's options (depending on
+/// LLVM version and on LLVM configuration), and that thus cannot be created
+/// using static construction.
+/// The clashing LLVM options are suffixed with "llvm-" and hidden from the
+/// -help output.
+void createClashingOptions() {
+#if LDC_LLVM_VER >= 307
+ llvm::StringMap<cl::Option *> &map = cl::getRegisteredOptions();
+#else
+ llvm::StringMap<cl::Option *> map;
+ cl::getRegisteredOptions(map);
+#endif
+
+ auto renameAndHide = [&map](const char *from, const char *to) {
+ auto i = map.find(from);
+ if (i != map.end()) {
+ cl::Option *opt = i->getValue();
+ map.erase(i);
+ opt->setArgStr(to);
+ opt->setHiddenFlag(cl::Hidden);
+ map[to] = opt;
+ }
+ };
+
+ // Step 1. Hide the clashing LLVM options.
+ // LLVM 3.7 introduces compiling as shared library. The result
+ // is a clash in the command line options.
+ renameAndHide("color", "llvm-color");
+
+ // Step 2. Add the LDC options.
+ new cl::opt<bool, true, FlagParser<bool>>(
+ "color", cl::desc("Force colored console output"),
+ cl::location(global.params.color));
+}
+
+/// Hides command line options exposed from within LLVM that are unlikely
+/// to be useful for end users from the -help output.
+void hideLLVMOptions() {
+#if LDC_LLVM_VER >= 307
+ llvm::StringMap<cl::Option *> &map = cl::getRegisteredOptions();
+#else
+ llvm::StringMap<cl::Option *> map;
+ cl::getRegisteredOptions(map);
+#endif
+
+ auto hide = [&map](const char *name) {
+ // Check if option exists first for resilience against LLVM changes
+ // between versions.
+ if (map.count(name)) {
+ map[name]->setHiddenFlag(cl::Hidden);
+ }
+ };
+
+ hide("bounds-checking-single-trap");
+ hide("disable-debug-info-verifier");
+ hide("disable-objc-arc-checkforcfghazards");
+ hide("disable-spill-fusing");
+ hide("cppfname");
+ hide("cppfor");
+ hide("cppgen");
+ hide("enable-correct-eh-support");
+ hide("enable-load-pre");
+ hide("enable-misched");
+ hide("enable-objc-arc-annotations");
+ hide("enable-objc-arc-opts");
+ hide("enable-scoped-noalias");
+ hide("enable-tbaa");
+ hide("exhaustive-register-search");
+ hide("fatal-assembler-warnings");
+ hide("internalize-public-api-file");
+ hide("internalize-public-api-list");
+ hide("join-liveintervals");
+ hide("limit-float-precision");
+ hide("mc-x86-disable-arith-relaxation");
+ hide("mips16-constant-islands");
+ hide("mips16-hard-float");
+ hide("mlsm");
+ hide("mno-ldc1-sdc1");
+ hide("nvptx-sched4reg");
+ hide("no-discriminators");
+ hide("objc-arc-annotation-target-identifier");
+ hide("pre-RA-sched");
+ hide("print-after-all");
+ hide("print-before-all");
+ hide("print-machineinstrs");
+ hide("profile-estimator-loop-weight");
+ hide("profile-estimator-loop-weight");
+ hide("profile-file");
+ hide("profile-info-file");
+ hide("profile-verifier-noassert");
+ hide("regalloc");
+ hide("rewrite-map-file");
+ hide("rng-seed");
+ hide("sample-profile-max-propagate-iterations");
+ hide("shrink-wrap");
+ hide("spiller");
+ hide("stackmap-version");
+ hide("stats");
+ hide("strip-debug");
+ hide("struct-path-tbaa");
+ hide("time-passes");
+ hide("unit-at-a-time");
+ hide("verify-debug-info");
+ hide("verify-dom-info");
+ hide("verify-loop-info");
+ hide("verify-regalloc");
+ hide("verify-region-info");
+ hide("verify-scev");
+ hide("x86-early-ifcvt");
+ hide("x86-use-vzeroupper");
+ hide("x86-recip-refinement-steps");
+
+ // We enable -fdata-sections/-ffunction-sections by default where it makes
+ // sense for reducing code size, so hide them to avoid confusion.
+ //
+ // We need our own switch as these two are defined by LLVM and linked to
+ // static TargetMachine members, but the default we want to use depends
+ // on the target triple (and thus we do not know it until after the command
+ // line has been parsed).
+ hide("fdata-sections");
+ hide("ffunction-sections");
+}
+
} // namespace opts
diff --git a/driver/cl_options.h b/driver/cl_options.h
index 46ecf18..ae80cd8 100644
--- a/driver/cl_options.h
+++ b/driver/cl_options.h
@@ -93,9 +93,8 @@ extern cl::opt<bool> instrumentFunctions;
extern std::vector<std::string> debugArgs;
// Arguments to -run
-#if LDC_LLVM_VER >= 307
-void CreateColorOption();
-#endif
+void createClashingOptions();
+void hideLLVMOptions();
#if LDC_LLVM_VER >= 309
// LTO options
diff --git a/driver/main.cpp b/driver/main.cpp
index 2bc96ec..7c2bcc1 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -231,113 +231,6 @@ void initFromPathString(const char *&dest, const cl::opt<std::string> &src) {
}
}
-void hide(llvm::StringMap<cl::Option *> &map, const char *name) {
- // Check if option exists first for resilience against LLVM changes
- // between versions.
- if (map.count(name)) {
- map[name]->setHiddenFlag(cl::Hidden);
- }
-}
-
-#if LDC_LLVM_VER >= 307
-void rename(llvm::StringMap<cl::Option *> &map, const char *from,
- const char *to) {
- auto i = map.find(from);
- if (i != map.end()) {
- cl::Option *opt = i->getValue();
- map.erase(i);
- opt->setArgStr(to);
- map[to] = opt;
- }
-}
-#endif
-
-/// Removes command line options exposed from within LLVM that are unlikely
-/// to be useful for end users from the -help output.
-void hideLLVMOptions() {
-#if LDC_LLVM_VER >= 307
- llvm::StringMap<cl::Option *> &map = cl::getRegisteredOptions();
-#else
- llvm::StringMap<cl::Option *> map;
- cl::getRegisteredOptions(map);
-#endif
- hide(map, "bounds-checking-single-trap");
- hide(map, "disable-debug-info-verifier");
- hide(map, "disable-objc-arc-checkforcfghazards");
- hide(map, "disable-spill-fusing");
- hide(map, "cppfname");
- hide(map, "cppfor");
- hide(map, "cppgen");
- hide(map, "enable-correct-eh-support");
- hide(map, "enable-load-pre");
- hide(map, "enable-misched");
- hide(map, "enable-objc-arc-annotations");
- hide(map, "enable-objc-arc-opts");
- hide(map, "enable-scoped-noalias");
- hide(map, "enable-tbaa");
- hide(map, "exhaustive-register-search");
- hide(map, "fatal-assembler-warnings");
- hide(map, "internalize-public-api-file");
- hide(map, "internalize-public-api-list");
- hide(map, "join-liveintervals");
- hide(map, "limit-float-precision");
- hide(map, "mc-x86-disable-arith-relaxation");
- hide(map, "mips16-constant-islands");
- hide(map, "mips16-hard-float");
- hide(map, "mlsm");
- hide(map, "mno-ldc1-sdc1");
- hide(map, "nvptx-sched4reg");
- hide(map, "no-discriminators");
- hide(map, "objc-arc-annotation-target-identifier"), hide(map, "pre-RA-sched");
- hide(map, "print-after-all");
- hide(map, "print-before-all");
- hide(map, "print-machineinstrs");
- hide(map, "profile-estimator-loop-weight");
- hide(map, "profile-estimator-loop-weight");
- hide(map, "profile-file");
- hide(map, "profile-info-file");
- hide(map, "profile-verifier-noassert");
- hide(map, "regalloc");
- hide(map, "rewrite-map-file");
- hide(map, "rng-seed");
- hide(map, "sample-profile-max-propagate-iterations");
- hide(map, "shrink-wrap");
- hide(map, "spiller");
- hide(map, "stackmap-version");
- hide(map, "stats");
- hide(map, "strip-debug");
- hide(map, "struct-path-tbaa");
- hide(map, "time-passes");
- hide(map, "unit-at-a-time");
- hide(map, "verify-debug-info");
- hide(map, "verify-dom-info");
- hide(map, "verify-loop-info");
- hide(map, "verify-regalloc");
- hide(map, "verify-region-info");
- hide(map, "verify-scev");
- hide(map, "x86-early-ifcvt");
- hide(map, "x86-use-vzeroupper");
- hide(map, "x86-recip-refinement-steps");
-
- // We enable -fdata-sections/-ffunction-sections by default where it makes
- // sense for reducing code size, so hide them to avoid confusion.
- //
- // We need our own switch as these two are defined by LLVM and linked to
- // static TargetMachine members, but the default we want to use depends
- // on the target triple (and thus we do not know it until after the command
- // line has been parsed).
- hide(map, "fdata-sections");
- hide(map, "ffunction-sections");
-
-#if LDC_LLVM_VER >= 307
- // LLVM 3.7 introduces compiling as shared library. The result
- // is a clash in the command line options.
- rename(map, "color", "llvm-color");
- hide(map, "llvm-color");
- opts::CreateColorOption();
-#endif
-}
-
const char *tryGetExplicitConfFile(int argc, char **argv) {
// begin at the back => use latest -conf= specification
for (int i = argc - 1; i >= 1; --i) {
@@ -425,7 +318,9 @@ void parseCommandLine(int argc, char **argv, Strings &sourceFiles,
opts::allArguments.insert(opts::allArguments.end(), &argv[1], &argv[argc]);
cl::SetVersionPrinter(&printVersion);
- hideLLVMOptions();
+
+ opts::hideLLVMOptions();
+ opts::createClashingOptions();
// pre-expand response files (LLVM's ParseCommandLineOptions() always uses
// TokenizeGNUCommandLine which eats backslashes)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git
More information about the pkg-d-commits
mailing list