Page MenuHomePhabricator

Please use GitHub pull requests for new patches. Phabricator shutdown timeline

Differential D82860

Port ObjCMTAction to new option parsing system
ClosedPublic
Actions

Authored by jansvoboda11 on Jun 30 2020, 4:03 AM.

Details

Reviewers
Bigcheese
dang
Commits
rGd2d59d2be985: Reland [clang][cli] Port ObjCMTAction to new option parsing system
rG09248a5d25bb: [clang][cli] Port ObjCMTAction to new option parsing system
Summary

Merge existing marhsalling info kinds and add some primitives to
express flag options that contribute to a bitfield.

Depends on D82574

Diff Detail

Event Timeline

dang created this revision.Jun 30 2020, 4:03 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJun 30 2020, 4:03 AM
Herald added subscribers: llvm-commits, cfe-commits, jfb, dexonsmith. · View Herald Transcript
dang marked an inline comment as done.Jun 30 2020, 4:05 AM
dang added inline comments.
clang/include/clang/Driver/Options.td
345–347

If this kind of combination of normalizer, value merger and extractor happen again, I will make a mixin that helps set this up. Or do you reckon it is worth doing it now for readability.

Harbormaster failed remote builds in B62305: Diff 274410!Jun 30 2020, 4:51 AM
dang updated this revision to Diff 274425.Jun 30 2020, 4:54 AM

Denormalizer should also use the extractor

Harbormaster failed remote builds in B62308: Diff 274425!Jun 30 2020, 5:55 AM
dang added a child revision: D82874: Add diagnostic option backing field for -fansi-escape-codes.Jun 30 2020, 6:26 AM
dang marked an inline comment as not done.Jun 30 2020, 10:13 AM
dang updated this revision to Diff 274736.Jul 1 2020, 3:16 AM

Remove the need for the merger and extractor to be macros

Harbormaster failed remote builds in B62471: Diff 274736!Jul 1 2020, 3:45 AM
dang updated this revision to Diff 275171.Jul 2 2020, 11:09 AM

Ensure that mergeForwardValue can accept default values whose type doesn't quite match the associated keypath.

Harbormaster failed remote builds in B62722: Diff 275171!Jul 2 2020, 11:21 AM
dang updated this revision to Diff 276008.Jul 7 2020, 5:12 AM

Make mergers use values directly instead of constant references.

Harbormaster failed remote builds in B63187: Diff 276008!Jul 7 2020, 5:12 AM
dang removed a child revision: D82874: Add diagnostic option backing field for -fansi-escape-codes.Jul 9 2020, 11:28 PM
dang added a child revision: D83071: Add support for options with two flags for controlling the same field..Jul 27 2020, 10:22 AM
Bigcheese accepted this revision.Aug 19 2020, 5:45 PM

lgtm

This revision is now accepted and ready to land.Aug 19 2020, 5:45 PM
jansvoboda11 commandeered this revision.Nov 9 2020, 4:18 AM
jansvoboda11 added a reviewer: dang.
jansvoboda11 added a subscriber: jansvoboda11.

Taking control of this revision, as Daniel is no longer involved.

jansvoboda11 updated this revision to Diff 303828.Nov 9 2020, 4:50 AM

Rebase on top of D82756.

jansvoboda11 requested review of this revision.Nov 9 2020, 4:51 AM

WDYT @Bigcheese?

Bigcheese accepted this revision.Nov 10 2020, 8:58 AM

LGTM.

This revision is now accepted and ready to land.Nov 10 2020, 8:58 AM
Closed by commit rG09248a5d25bb: [clang][cli] Port ObjCMTAction to new option parsing system (authored by jansvoboda11). · Explain WhyNov 11 2020, 4:03 AM
This revision was automatically updated to reflect the committed changes.
jansvoboda11 added a commit: rG09248a5d25bb: [clang][cli] Port ObjCMTAction to new option parsing system.
jpienaar added a subscriber: jpienaar.Nov 11 2020, 8:39 AM

This seems to breaking clang-5 builds:

utils/TableGen/CMakeFiles/llvm-tblgen.dir/OptParserEmitter.cpp.o: In function `llvm::EmitOptParser(llvm::RecordKeeper&, llvm::raw_ostream&)':
/var/lib/buildkite-agent/builds/buildkite-69fdf6c495-wt2bd-1/mlir/mlir-core/llvm/utils/TableGen/OptParserEmitter.cpp:(.text._ZN4llvm13EmitOptParserERNS_12RecordKeeperERNS_11raw_ostreamE+0x148a): undefined reference to `MarshallingInfo::MacroName'
clang: error: linker command failed with exit code 1 (use -v to see invocation)

(https://buildkite.com/mlir/mlir-core/builds/9273#ae602c1f-8c21-4ac6-90bb-99c9a3ae473e)

dexonsmith added a comment.Nov 11 2020, 10:38 AM
In D82860#2388916, @jpienaar wrote:

This seems to breaking clang-5 builds:

utils/TableGen/CMakeFiles/llvm-tblgen.dir/OptParserEmitter.cpp.o: In function `llvm::EmitOptParser(llvm::RecordKeeper&, llvm::raw_ostream&)':
/var/lib/buildkite-agent/builds/buildkite-69fdf6c495-wt2bd-1/mlir/mlir-core/llvm/utils/TableGen/OptParserEmitter.cpp:(.text._ZN4llvm13EmitOptParserERNS_12RecordKeeperERNS_11raw_ostreamE+0x148a): undefined reference to `MarshallingInfo::MacroName'
clang: error: linker command failed with exit code 1 (use -v to see invocation)

(https://buildkite.com/mlir/mlir-core/builds/9273#ae602c1f-8c21-4ac6-90bb-99c9a3ae473e)

Jan is in Europe and may not see this until tomorrow; if you need this fixed sooner you might want to revert.

mehdi_amini added a reverting change: rGf917356f9ce0: Revert "[clang][cli] Port ObjCMTAction to new option parsing system".Nov 11 2020, 12:01 PM
mehdi_amini added a subscriber: mehdi_amini.Nov 11 2020, 12:02 PM

Reverted in f917356f9ce0 ; I suspect a static constexpr in a class missing a definition out of class (required pre-c++17).

jansvoboda11 added a commit: rGd2d59d2be985: Reland [clang][cli] Port ObjCMTAction to new option parsing system.Nov 13 2020, 4:44 AM
jansvoboda11 added a comment.Nov 13 2020, 4:45 AM

Thank you for the heads-up. It seems like Clang 5 didn't like the usage of static constexpr member via an instance.

Revision Contents
Changeset List

PathSize
clang/
include/
clang/
Driver/
47 lines
lib/
Frontend/
129 lines
llvm/
include/
llvm/
Option/
32 lines
unittests/
Option/
34 lines
16 lines
utils/
TableGen/
188 lines

Diff 304468

View Options

clang/include/clang/Driver/Options.td

Loading...
View Options

clang/lib/Frontend/CompilerInvocation.cpp

Loading...
View Options

llvm/include/llvm/Option/OptParser.td

Loading...
View Options

llvm/unittests/Option/OptionMarshallingTest.cpp

Loading...
View Options

llvm/unittests/Option/Opts.td

Loading...
View Options

llvm/utils/TableGen/OptParserEmitter.cpp

Loading...