Swift: use structured generated C++ classes in `DeclVisitor` by redsun82 · Pull Request #9230 · github/codeql

redsun82 · 2022-05-20T08:05:10Z

This PR introduces using structured generated C++ classes in DeclVisitor.

The coding style moves to translation methods taking in a swift entity and filling a trap class instance, a bit in the style of gRPC method implementations. Shortcuts are provided to fill optional and repeated properties (fetchOptionalLabel and fetchRepeatedLabels). No explicit mention of trap entries is needed any more, but they could still be used alongside this higher-level interface.

Also, the Binding template class has been removed and aggregate initialization of generated C++ classes disallowed.

Binding was meant to allow aggregate initialization of generated C++ entries having the label id as first argument, before fields from superclasses.

As aggregate initialization turned out to be undesirable (names of fields are not explicit, and {} must be inserted for empty
superclasses), Binding is removed it and aggregate initialization are disallowed by defining empty constructors for generated
classes.

AlexDenisov

Love it! ❤️

redsun82 · 2022-05-23T15:23:05Z

I made the PR a bit smaller than before and added some comments to the new functions.

With respect to the previous version of this PR, I undid the is_unknown move. It's still kind of an issue, as there will be repeated is_unknown fields in the classes layouts, but it does not prevent the current PR from working. There can be future changes to address that (of which I prefer the possibility to optionally skip C++ generation for some optional or repeated fields).

I also moved fetchOptionalLabel and fetchRepeatedLabels to the dispatcher, as it was unclear yet what belonged to the dispatcher and what to VisitorBase. Maybe we can reorganize the classes later to move all methods relevant to the visitors to VisitorBase.

sashabu

I've reviewed the "interesting" parts of this PR, but:

I haven't done a thorough review of DeclVisitor.h since it looks fairly mechanical and
I'm not familiar with Mustache syntax, so I only commented on what I think the resulting C++ will look like

since Alex is the main reviewer. Let me know if you'd like a more thorough review from me.

sashabu

LGTM with the same caveats that:

I haven't done a thorough review of DeclVisitor.h since it looks fairly mechanical and
I'm not familiar with Mustache syntax, so I only commented on what I think the resulting C++ will look like

That class was meant to allow aggregate initialization of generated C++ entries having the label `id` as first argument. As aggregate initialization turned out to be undesirable (names of fields are not explicit, and `{}` must be inserted for empty superclasses), this commit removes it and disallows aggregate initialization altogether by defining empty constructors for generated classes.

Translation now takes const references to swift entities and return trap entries (instead of taking apointer as an out parameter).

This disallows completely calling the disabled function (which could be done by explicitly providing `void` otherwise).

While we need universal references to catch different value categories, we don't need perfect forwarding as `fetchLabel` does not behave differently on lvalue and rvalues.

redsun82 · 2022-06-17T15:08:54Z

@AlexDenisov I've merged your deduplication branch into this and selected it as a target. Once we merge that, I can rebase this and put it back to review.

github-actions Bot added the Swift label May 20, 2022

redsun82 force-pushed the redsun82/swift-use-generated-classes branch from 17e8be0 to e84cef8 Compare May 20, 2022 08:16

AlexDenisov reviewed May 20, 2022

View reviewed changes

Comment thread swift/extractor/visitors/DeclVisitor.h Outdated

redsun82 force-pushed the redsun82/swift-type-visitor branch from 314dd2e to 685ffc9 Compare May 20, 2022 10:15

Base automatically changed from redsun82/swift-type-visitor to redsun82/swift-visitors May 20, 2022 10:15

redsun82 force-pushed the redsun82/swift-visitors branch from 9d03e87 to b0668ee Compare May 20, 2022 13:43

redsun82 force-pushed the redsun82/swift-use-generated-classes branch from e84cef8 to f985003 Compare May 20, 2022 14:10

Base automatically changed from redsun82/swift-visitors to main May 20, 2022 14:38

redsun82 force-pushed the redsun82/swift-use-generated-classes branch 3 times, most recently from 000aaf0 to 1ab095a Compare May 23, 2022 15:16

redsun82 changed the title ~~Swift: showcase C++ entry style visitor~~ Swift: use structured generated C++ classes in DeclVisitor May 23, 2022

redsun82 marked this pull request as ready for review May 23, 2022 15:17

redsun82 requested a review from a team as a code owner May 23, 2022 15:17

redsun82 requested a review from AlexDenisov May 23, 2022 15:17

redsun82 added the no-change-note-required This PR does not need a change note label May 23, 2022

redsun82 force-pushed the redsun82/swift-use-generated-classes branch from 1ab095a to 43888e7 Compare May 24, 2022 10:54

sashabu reviewed May 30, 2022

View reviewed changes

redsun82 force-pushed the redsun82/swift-use-generated-classes branch from 43888e7 to c65462e Compare May 31, 2022 09:14

sashabu reviewed May 31, 2022

View reviewed changes

Comment thread swift/extractor/SwiftDispatcher.h Outdated

redsun82 added 6 commits June 1, 2022 08:41

Swift: use C++ entry style visitor in DeclVisitor

9231013

Swift: fix name extraction in VarDecl

c3cb0d6

Swift: change translation signature and detection

19f1667

Translation now takes const references to swift entities and return trap entries (instead of taking apointer as an out parameter).

Swift: update comment

905cc23

Swift: make enable_if_t a non-type parameter

6e44a12

This disallows completely calling the disabled function (which could be done by explicitly providing `void` otherwise).

redsun82 force-pushed the redsun82/swift-use-generated-classes branch from 68716ee to 6e44a12 Compare June 1, 2022 06:48

redsun82 added 2 commits June 1, 2022 11:26

Swift: no perfect forwarding for label fetchers

4d6c8da

While we need universal references to catch different value categories, we don't need perfect forwarding as `fetchLabel` does not behave differently on lvalue and rvalues.

Merge alexdenisov/xref-decls into redsun82/swift-use-generated-classes

be210aa

redsun82 changed the base branch from main to alexdenisov/xref-decls June 17, 2022 15:06

redsun82 marked this pull request as draft June 17, 2022 15:06

Base automatically changed from alexdenisov/xref-decls to main June 20, 2022 08:43

redsun82 added 2 commits June 20, 2022 17:53

Merge main into redsun82/swift-use-generated-classes

48584a6

Merge main into redsun82/swift-use-generated-classes

3d222a7

redsun82 marked this pull request as ready for review June 20, 2022 16:02

AlexDenisov approved these changes Jun 21, 2022

View reviewed changes

AlexDenisov merged commit 687b9af into main Jun 21, 2022

AlexDenisov deleted the redsun82/swift-use-generated-classes branch June 21, 2022 05:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swift: use structured generated C++ classes in `DeclVisitor`#9230

Swift: use structured generated C++ classes in `DeclVisitor`#9230
AlexDenisov merged 10 commits into
mainfrom
redsun82/swift-use-generated-classes

redsun82 commented May 20, 2022 •

edited

Loading

Uh oh!

AlexDenisov left a comment

Uh oh!

Uh oh!

redsun82 commented May 23, 2022

Uh oh!

sashabu left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sashabu left a comment

Uh oh!

Uh oh!

redsun82 commented Jun 17, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

redsun82 commented May 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AlexDenisov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

redsun82 commented May 23, 2022

Uh oh!

sashabu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sashabu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

redsun82 commented Jun 17, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

redsun82 commented May 20, 2022 •

edited

Loading