[Clang importer] Use ParseSourceFileRequest for parsing swift_attr attributes #77628
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DougGregor
requested review from
xymus,
ahoppen,
bnbarham,
CodaFi,
hamishknight,
rintaro,
zoecarver,
hyp,
egorzhdan,
beccadax,
ian-twilightcoder,
Xazax-hun,
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci please smoke test |
rintaro
reviewed
Nov 14, 2024
include/swift/AST/Attr.h
Outdated
| @@ -1802,6 +1902,11 @@ class CustomAttr final : public DeclAttribute { | |||
| return DA->getKind() == DeclAttrKind::Custom; | |||
| } | |||
|
|
|||
| /// Create a copy of this attribute. | |||
| CustomAttr *clone(ASTContext &ctx) const { | |||
| return create(ctx, AtLoc, getTypeExpr(), isImplicit()); | |||
There was a problem hiding this comment.
ArgumentList *argList; and PatternBindingInitializer *initContext; are not cloned. Do we need to support CustomAttr in swift_attrs? If not, we should make this UNIMPLEMENTED_CLONE, then skip CustomAttr before cloning in ImportDecl (and diagnose).
There was a problem hiding this comment.
We do need CustomAttr, yes.
include/swift/AST/Attr.h
Outdated
| @@ -1131,6 +1163,8 @@ class TypeEraserAttr final : public DeclAttribute { | |||
| static bool classof(const DeclAttribute *DA) { | |||
| return DA->getKind() == DeclAttrKind::TypeEraser; | |||
| } | |||
|
|
|||
| UNIMPLEMENTED_CLONE(DynamicReplacementAttr) | |||
There was a problem hiding this comment.
Suggested change
| UNIMPLEMENTED_CLONE(DynamicReplacementAttr) | |
| UNIMPLEMENTED_CLONE(TypeEraserAttr) |
There was a problem hiding this comment.
Nice catch, thank you!
…tributes The Clang importer was directly calling into the parser to parse the attribute (or modifier) within swift_attr. Aside from being gross, this isn't possible with ASTGen. Instead, teach ParseSourceFileRequest to deal with modifiers in the same way that the Clang importer was hardcoding, and have the Clang importer pull the attributes/modifiers off of the "missing" declaration introduced by the request. One benefit of this approach is that we're only parsing each swift_attr source buffer once, then cloning the attributes each time it's used, so we should be doing less work overall. Fixes rdar://139119159.
…erly-typed clone() Code review identified some incorrect UNIMPLEMENTED_CLONEs in DeclAttribute (thank you Hamish and Rintaro). Fix those, and make sure this can't happen again by checking the type signatures of clone() in every DeclAttribute subclass.
DougGregor
force-pushed
the
clang-importer-parse-request
branch
from
62960e1 to
24a12eb
Compare
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
rintaro
approved these changes
Nov 15, 2024
|
@swift-ci please smoke test |
|
@swift-ci please smoke test windows |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Clang importer was directly calling into the parser to parse the
attribute (or modifier) within swift_attr. Aside from being gross, this
isn't possible with ASTGen.
Instead, teach ParseSourceFileRequest to deal with modifiers in the
same way that the Clang importer was hardcoding, and have the Clang
importer pull the attributes/modifiers off of the "missing"
declaration introduced by the request.
One benefit of this approach is that we're only parsing each
swift_attr source buffer once, then cloning the attributes each time
it's used, so we should be doing less work overall.
Fixes rdar://139119159.