From cd38a74bafb79e9cb5cbb1c163744b2ad44262ad Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Tue, 20 Aug 2024 19:27:37 -0700 Subject: [PATCH] Add new parameters to OPTION macro As in most LLVM updates, `OPTION` has been modified. Update `makeOptions.cpp` to take this into account. --- Sources/makeOptions/makeOptions.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Sources/makeOptions/makeOptions.cpp b/Sources/makeOptions/makeOptions.cpp index 5ab8472d5..e06051999 100644 --- a/Sources/makeOptions/makeOptions.cpp +++ b/Sources/makeOptions/makeOptions.cpp @@ -38,8 +38,9 @@ enum class OptionKind { }; #define LLVM_MAKE_OPT_ID_WITH_ID_PREFIX(ID_PREFIX, PREFIX, NAME, ID, KIND, \ - GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \ - HELPTEXT, METAVAR, VALUES) \ + GROUP, ALIAS, ALIASARGS, FLAGS, \ + VISIBILITY, PARAM, HELPTEXT, \ + HELPTEXTFORVARIANTS, METAVAR, VALUES) \ ID_PREFIX##ID //. The IDs of each option @@ -134,9 +135,10 @@ struct RawOption { #undef PREFIX static const RawOption rawOptions[] = { -#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \ - HELPTEXT, METAVAR, VALUES) \ - { OptionID::Opt_##ID, PREFIX, NAME, swiftify(#ID), OptionKind::KIND, \ +#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, \ + VISIBILITY, PARAM, HELPTEXT, HELPTEXTFORVARIANTS, METAVAR, \ + VALUES) \ + { OptionID::Opt_##ID, PREFIX, NAME, swiftify(#ID), OptionKind::KIND, \ OptionID::Opt_##GROUP, OptionID::Opt_##ALIAS, FLAGS, HELPTEXT, METAVAR, PARAM }, #include "swift/Option/Options.inc" #undef OPTION