Skip to content

Commit 2393b03

Browse files
jansvoboda11jansvoboda11
committed
Revert "[clang][cli] Use variadic macros for parsing/generating"
This reverts commit 374862d. Some build bots are failing with: clang/Driver/Options.inc(4315): warning C4003: not enough arguments for function-like macro invocation 'PARSE_OPTION_WITH_MARSHALLING' clang/Driver/Options.inc(4315): warning C4003: not enough arguments for function-like macro invocation 'NO_PREFIX' clang/Driver/Options.inc(4315): error C2059: syntax error: ')' clang/Driver/Options.inc(4315): error C2143: syntax error: missing ';' before '{' clang/Driver/Options.inc(4315): error C2059: syntax error: '='
1 parent 3ca502a commit 2393b03

File tree

1 file changed

+76
-35
lines changed

1 file changed

+76
-35
lines changed

‎clang/lib/Frontend/CompilerInvocation.cpp

Lines changed: 76 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -385,44 +385,36 @@ static T extractMaskValue(T KeyPath) {
385385
return KeyPath & Value;
386386
}
387387

388-
#define THIS_PREFIX(KEYPATH) this->KEYPATH
389-
#define NO_PREFIX(KEYPATH) KEYPATH
390-
391-
#define PARSE_OPTION_WITH_MARSHALLING( \
392-
ARGS, DIAGS, SUCCESS, PREFIX_KEYPATH, PREFIX_TYPE, NAME, ID, KIND, GROUP, \
393-
ALIAS, ALIASARGS, FLAGS, PARAM, HELPTEXT, METAVAR, VALUES, SPELLING, \
394-
SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, DEFAULT_VALUE, IMPLIED_CHECK, \
395-
IMPLIED_VALUE, NORMALIZER, DENORMALIZER, MERGER, EXTRACTOR, TABLE_INDEX) \
388+
#define PARSE_OPTION_WITH_MARSHALLING(ARGS, DIAGS, SUCCESS, ID, FLAGS, PARAM, \
389+
SHOULD_PARSE, KEYPATH, DEFAULT_VALUE, \
390+
IMPLIED_CHECK, IMPLIED_VALUE, \
391+
NORMALIZER, MERGER, TABLE_INDEX) \
396392
if ((FLAGS)&options::CC1Option) { \
397-
PREFIX_KEYPATH(KEYPATH) = MERGER(PREFIX_KEYPATH(KEYPATH), DEFAULT_VALUE); \
393+
KEYPATH = MERGER(KEYPATH, DEFAULT_VALUE); \
398394
if (IMPLIED_CHECK) \
399-
PREFIX_KEYPATH(KEYPATH) = \
400-
MERGER(PREFIX_KEYPATH(KEYPATH), IMPLIED_VALUE); \
395+
KEYPATH = MERGER(KEYPATH, IMPLIED_VALUE); \
401396
if (SHOULD_PARSE) \
402397
if (auto MaybeValue = \
403398
NORMALIZER(OPT_##ID, TABLE_INDEX, ARGS, DIAGS, SUCCESS)) \
404-
PREFIX_KEYPATH(KEYPATH) = MERGER( \
405-
PREFIX_KEYPATH(KEYPATH), \
406-
static_cast<decltype(PREFIX_KEYPATH(KEYPATH))>(*MaybeValue)); \
399+
KEYPATH = \
400+
MERGER(KEYPATH, static_cast<decltype(KEYPATH)>(*MaybeValue)); \
407401
}
408402

409403
// Capture the extracted value as a lambda argument to avoid potential issues
410404
// with lifetime extension of the reference.
411405
#define GENERATE_OPTION_WITH_MARSHALLING( \
412-
ARGS, STRING_ALLOCATOR, PREFIX_KEYPATH, PREFIX_TYPE, NAME, ID, KIND, \
413-
GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, HELPTEXT, METAVAR, VALUES, \
414-
SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, DEFAULT_VALUE, \
415-
IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, MERGER, EXTRACTOR, \
406+
ARGS, STRING_ALLOCATOR, KIND, FLAGS, SPELLING, ALWAYS_EMIT, KEYPATH, \
407+
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, DENORMALIZER, EXTRACTOR, \
416408
TABLE_INDEX) \
417409
if ((FLAGS)&options::CC1Option) { \
418410
[&](const auto &Extracted) { \
419411
if (ALWAYS_EMIT || \
420412
(Extracted != \
421-
static_cast<decltype(PREFIX_KEYPATH(KEYPATH))>( \
422-
(IMPLIED_CHECK) ? (IMPLIED_VALUE) : (DEFAULT_VALUE)))) \
413+
static_cast<decltype(KEYPATH)>((IMPLIED_CHECK) ? (IMPLIED_VALUE) \
414+
: (DEFAULT_VALUE)))) \
423415
DENORMALIZER(ARGS, SPELLING, STRING_ALLOCATOR, Option::KIND##Class, \
424416
TABLE_INDEX, Extracted); \
425-
}(EXTRACTOR(PREFIX_KEYPATH(KEYPATH))); \
417+
}(EXTRACTOR(KEYPATH)); \
426418
}
427419

428420
static const StringRef GetInputKindName(InputKind IK);
@@ -994,8 +986,15 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
994986
// variable name and type.
995987
const LangOptions *LangOpts = &LangOptsRef;
996988

997-
#define CODEGEN_OPTION_WITH_MARSHALLING(...) \
998-
PARSE_OPTION_WITH_MARSHALLING(Args, Diags, Success, NO_PREFIX, __VA_ARGS__)
989+
#define CODEGEN_OPTION_WITH_MARSHALLING( \
990+
PREFIX_TYPE, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
991+
HELPTEXT, METAVAR, VALUES, SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
992+
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, \
993+
MERGER, EXTRACTOR, TABLE_INDEX) \
994+
PARSE_OPTION_WITH_MARSHALLING(Args, Diags, Success, ID, FLAGS, PARAM, \
995+
SHOULD_PARSE, KEYPATH, DEFAULT_VALUE, \
996+
IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, \
997+
MERGER, TABLE_INDEX)
999998
#include "clang/Driver/Options.inc"
1000999
#undef CODEGEN_OPTION_WITH_MARSHALLING
10011000

@@ -1457,8 +1456,15 @@ bool CompilerInvocation::parseSimpleArgs(const ArgList &Args,
14571456
DiagnosticsEngine &Diags) {
14581457
bool Success = true;
14591458

1460-
#define OPTION_WITH_MARSHALLING(...) \
1461-
PARSE_OPTION_WITH_MARSHALLING(Args, Diags, Success, THIS_PREFIX, __VA_ARGS__)
1459+
#define OPTION_WITH_MARSHALLING( \
1460+
PREFIX_TYPE, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
1461+
HELPTEXT, METAVAR, VALUES, SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
1462+
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, \
1463+
MERGER, EXTRACTOR, TABLE_INDEX) \
1464+
PARSE_OPTION_WITH_MARSHALLING(Args, Diags, Success, ID, FLAGS, PARAM, \
1465+
SHOULD_PARSE, this->KEYPATH, DEFAULT_VALUE, \
1466+
IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, \
1467+
MERGER, TABLE_INDEX)
14621468
#include "clang/Driver/Options.inc"
14631469
#undef OPTION_WITH_MARSHALLING
14641470

@@ -1480,8 +1486,15 @@ bool clang::ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
14801486
DiagnosticOptions *DiagnosticOpts = &Opts;
14811487
bool Success = true;
14821488

1483-
#define DIAG_OPTION_WITH_MARSHALLING(...) \
1484-
PARSE_OPTION_WITH_MARSHALLING(Args, *Diags, Success, NO_PREFIX, __VA_ARGS__)
1489+
#define DIAG_OPTION_WITH_MARSHALLING( \
1490+
PREFIX_TYPE, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
1491+
HELPTEXT, METAVAR, VALUES, SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
1492+
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, \
1493+
MERGER, EXTRACTOR, TABLE_INDEX) \
1494+
PARSE_OPTION_WITH_MARSHALLING(Args, *Diags, Success, ID, FLAGS, PARAM, \
1495+
SHOULD_PARSE, KEYPATH, DEFAULT_VALUE, \
1496+
IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, \
1497+
MERGER, TABLE_INDEX)
14851498
#include "clang/Driver/Options.inc"
14861499
#undef DIAG_OPTION_WITH_MARSHALLING
14871500

@@ -1834,8 +1847,14 @@ static void GenerateHeaderSearchArgs(const HeaderSearchOptions &Opts,
18341847
SmallVectorImpl<const char *> &Args,
18351848
CompilerInvocation::StringAllocator SA) {
18361849
const HeaderSearchOptions *HeaderSearchOpts = &Opts;
1837-
#define HEADER_SEARCH_OPTION_WITH_MARSHALLING(...) \
1838-
GENERATE_OPTION_WITH_MARSHALLING(Args, SA, NO_PREFIX, __VA_ARGS__)
1850+
#define HEADER_SEARCH_OPTION_WITH_MARSHALLING( \
1851+
PREFIX_TYPE, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
1852+
HELPTEXT, METAVAR, VALUES, SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
1853+
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, \
1854+
MERGER, EXTRACTOR, TABLE_INDEX) \
1855+
GENERATE_OPTION_WITH_MARSHALLING( \
1856+
Args, SA, KIND, FLAGS, SPELLING, ALWAYS_EMIT, KEYPATH, DEFAULT_VALUE, \
1857+
IMPLIED_CHECK, IMPLIED_VALUE, DENORMALIZER, EXTRACTOR, TABLE_INDEX)
18391858
#include "clang/Driver/Options.inc"
18401859
#undef HEADER_SEARCH_OPTION_WITH_MARSHALLING
18411860
}
@@ -1846,8 +1865,15 @@ static void ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args,
18461865
HeaderSearchOptions *HeaderSearchOpts = &Opts;
18471866
bool Success = true;
18481867

1849-
#define HEADER_SEARCH_OPTION_WITH_MARSHALLING(...) \
1850-
PARSE_OPTION_WITH_MARSHALLING(Args, Diags, Success, NO_PREFIX, __VA_ARGS__)
1868+
#define HEADER_SEARCH_OPTION_WITH_MARSHALLING( \
1869+
PREFIX_TYPE, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
1870+
HELPTEXT, METAVAR, VALUES, SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
1871+
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, \
1872+
MERGER, EXTRACTOR, TABLE_INDEX) \
1873+
PARSE_OPTION_WITH_MARSHALLING(Args, Diags, Success, ID, FLAGS, PARAM, \
1874+
SHOULD_PARSE, KEYPATH, DEFAULT_VALUE, \
1875+
IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, \
1876+
MERGER, TABLE_INDEX)
18511877
#include "clang/Driver/Options.inc"
18521878
#undef HEADER_SEARCH_OPTION_WITH_MARSHALLING
18531879

@@ -2266,8 +2292,15 @@ void CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
22662292
LangOptions *LangOpts = &Opts;
22672293
bool Success = true;
22682294

2269-
#define LANG_OPTION_WITH_MARSHALLING(...) \
2270-
PARSE_OPTION_WITH_MARSHALLING(Args, Diags, Success, NO_PREFIX, __VA_ARGS__)
2295+
#define LANG_OPTION_WITH_MARSHALLING( \
2296+
PREFIX_TYPE, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
2297+
HELPTEXT, METAVAR, VALUES, SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
2298+
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, \
2299+
MERGER, EXTRACTOR, TABLE_INDEX) \
2300+
PARSE_OPTION_WITH_MARSHALLING(Args, Diags, Success, ID, FLAGS, PARAM, \
2301+
SHOULD_PARSE, KEYPATH, DEFAULT_VALUE, \
2302+
IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, \
2303+
MERGER, TABLE_INDEX)
22712304
#include "clang/Driver/Options.inc"
22722305
#undef LANG_OPTION_WITH_MARSHALLING
22732306

@@ -2983,8 +3016,16 @@ std::string CompilerInvocation::getModuleHash() const {
29833016

29843017
void CompilerInvocation::generateCC1CommandLine(
29853018
SmallVectorImpl<const char *> &Args, StringAllocator SA) const {
2986-
#define OPTION_WITH_MARSHALLING(...) \
2987-
GENERATE_OPTION_WITH_MARSHALLING(Args, SA, THIS_PREFIX, __VA_ARGS__)
3019+
#define OPTION_WITH_MARSHALLING( \
3020+
PREFIX_TYPE, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
3021+
HELPTEXT, METAVAR, VALUES, SPELLING, SHOULD_PARSE, ALWAYS_EMIT, KEYPATH, \
3022+
DEFAULT_VALUE, IMPLIED_CHECK, IMPLIED_VALUE, NORMALIZER, DENORMALIZER, \
3023+
MERGER, EXTRACTOR, TABLE_INDEX) \
3024+
GENERATE_OPTION_WITH_MARSHALLING(Args, SA, KIND, FLAGS, SPELLING, \
3025+
ALWAYS_EMIT, this->KEYPATH, DEFAULT_VALUE, \
3026+
IMPLIED_CHECK, IMPLIED_VALUE, DENORMALIZER, \
3027+
EXTRACTOR, TABLE_INDEX)
3028+
29883029
#define DIAG_OPTION_WITH_MARSHALLING OPTION_WITH_MARSHALLING
29893030
#define LANG_OPTION_WITH_MARSHALLING OPTION_WITH_MARSHALLING
29903031
#define CODEGEN_OPTION_WITH_MARSHALLING OPTION_WITH_MARSHALLING

0 commit comments

Comments
 (0)