-
Notifications
You must be signed in to change notification settings - Fork 852
Fix AttributeUsage.AllowMultiple not inherited for C#-defined attributes #19315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
edgarfgp
wants to merge
10
commits into
dotnet:main
Choose a base branch
from
edgarfgp:fix-17107-allowmultiple-inherited-csharp
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a676432
Fix AttributeUsage.AllowMultiple not inherited for C#-defined attribu…
edgarfgp 64a6899
Add release note for #17107 AllowMultiple inheritance fix
edgarfgp a4bcb23
Add release note for #17107 AllowMultiple inheritance fix
edgarfgp 1ad8a36
Merge branch 'main' into fix-17107-allowmultiple-inherited-csharp
edgarfgp 690275c
Merge branch 'main' into fix-17107-allowmultiple-inherited-csharp
edgarfgp ad37eeb
Merge branch 'main' into fix-17107-allowmultiple-inherited-csharp
edgarfgp 70e75f5
Merge branch 'main' into fix-17107-allowmultiple-inherited-csharp
edgarfgp 9317cae
Merge branch 'main' into fix-17107-allowmultiple-inherited-csharp
edgarfgp 66f279f
Merge branch 'main' into fix-17107-allowmultiple-inherited-csharp
edgarfgp 60bbec7
Merge branch 'main' into fix-17107-allowmultiple-inherited-csharp
edgarfgp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -3514,12 +3514,12 @@ let superOfTycon (g: TcGlobals) (tycon: Tycon) = | |||
| | None -> g.obj_ty_noNulls | ||||
| | Some ty -> ty | ||||
|
|
||||
| /// walk a TyconRef's inheritance tree, yielding any parent types as an array | ||||
| let supersOfTyconRef (tcref: TyconRef) = | ||||
| /// Walk a TyconRef's inheritance tree using the provided super-type resolver, yielding parent types as an array. | ||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this effectively
? |
||||
| let supersOfTyconRefWith (getSuper: TyconRef -> TyconRef option) (tcref: TyconRef) = | ||||
| tcref |> Array.unfold (fun tcref -> | ||||
| match tcref.TypeContents.tcaug_super with | ||||
| | Some (TType_app(sup, _, _)) -> Some(sup, sup) | ||||
| | _ -> None) | ||||
| match getSuper tcref with | ||||
| | Some sup -> Some(sup, sup) | ||||
| | None -> None) | ||||
|
|
||||
| //---------------------------------------------------------------------------- | ||||
| // Detect attributes | ||||
|
|
@@ -3654,10 +3654,11 @@ let TryFindTyconRefBoolAttribute g m attribSpec tcref = | |||
| | [ Some (:? bool as v : obj) ], _ -> Some v | ||||
| | _ -> None) | ||||
|
|
||||
| /// Try to find the resolved attributeusage for an type by walking its inheritance tree and picking the correct attribute usage value | ||||
| let TryFindAttributeUsageAttribute g m tcref = | ||||
| /// Try to find the resolved AttributeUsage for a type by walking its inheritance tree and picking the correct attribute usage value. | ||||
| /// The getSuper function is used to resolve the super-type of each type in the chain, allowing correct handling of both F# and IL-imported types. | ||||
| let TryFindAttributeUsageAttribute g m (getSuper: TyconRef -> TyconRef option) tcref = | ||||
| [| yield tcref | ||||
| yield! supersOfTyconRef tcref |] | ||||
| yield! supersOfTyconRefWith getSuper tcref |] | ||||
| |> Array.tryPick (fun tcref -> | ||||
| TryBindTyconRefAttribute g m g.attrib_AttributeUsageAttribute tcref | ||||
| (fun (_, named) -> named |> List.tryPick (function "AllowMultiple", _, _, ILAttribElem.Bool res -> Some res | _ -> None)) | ||||
|
|
||||
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the only caller of TryFindAttributeUsageAttribute?
The indirection by passing "getSuper" (which exists elsewhere, TypeHieararchy module has logic for this) seems artificial induced - is it because file ordering and/or required dependencies?
(
amaplikely?)