Skip to content

[sharpie] Fix platform type mapping for types inside generic type arguments. Fixes #24892. #24911

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.

Sign up for GitHub

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

Merged
rolfbjarne merged 2 commits into from
Mar 17, 2026
Merged

[sharpie] Fix platform type mapping for types inside generic type arguments. Fixes #24892. #24911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
312c135
[sharpie] Fix platform type mapping for types inside generic type arg…
rolfbjarne Mar 16, 2026
33b540c
[sharpie] Update ObjCGenerics test expectations for type argument map…
rolfbjarne Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/sharpie/Tests/Massagers/PlatformTypeMapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
@interface WebFetcher : NSObject <NSURLConnectionDelegate>
@property (nonatomic, readonly, copy) NSURL *url;
-(NSURLResponse *)getResponseForUrl:(NSURL *)url withCredential:(NSURLCredential *)credential;
-(void)loadDataWithUrl:(NSURL *)url completionHandler:(void (^)(NSData *, NSURLResponse *))handler;
@end
5 changes: 5 additions & 0 deletions tests/sharpie/Tests/Massagers/PlatformTypeMapping.iphoneos.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using Foundation;
using ObjCRuntime;

Expand All @@ -11,4 +12,8 @@ interface WebFetcher : INSUrlConnectionDelegate {
// -(NSURLResponse *)getResponseForUrl:(NSURL *)url withCredential:(NSURLCredential *)credential;
[Export ("getResponseForUrl:withCredential:")]
NSUrlResponse GetResponseForUrl (NSUrl url, NSUrlCredential credential);

// -(void)loadDataWithUrl:(NSURL *)url completionHandler:(void (^)(NSData *, NSURLResponse *))handler;
[Export ("loadDataWithUrl:completionHandler:")]
void LoadDataWithUrl (NSUrl url, Action<NSData, NSUrlResponse> handler);
}
5 changes: 5 additions & 0 deletions tests/sharpie/Tests/Massagers/PlatformTypeMapping.macosx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using Foundation;
using ObjCRuntime;

Expand All @@ -11,4 +12,8 @@ interface WebFetcher : INSUrlConnectionDelegate {
// -(NSURLResponse *)getResponseForUrl:(NSURL *)url withCredential:(NSURLCredential *)credential;
[Export ("getResponseForUrl:withCredential:")]
NSUrlResponse GetResponseForUrl (NSUrl url, NSUrlCredential credential);

// -(void)loadDataWithUrl:(NSURL *)url completionHandler:(void (^)(NSData *, NSURLResponse *))handler;
[Export ("loadDataWithUrl:completionHandler:")]
void LoadDataWithUrl (NSUrl url, Action<NSData, NSUrlResponse> handler);
}
6 changes: 3 additions & 3 deletions tests/sharpie/Tests/ObjCGenerics.iphoneos.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
interface CNLabeledValue : INSCopying, INSSecureCoding {
// @property (readonly, copy, nonatomic) ValueType ValueTypeProperty;
[Export ("ValueTypeProperty", ArgumentSemantic.Copy)]
NSObject<NSCopying, NSSecureCoding> ValueTypeProperty { get; }
NSObject<NSCopying, INSSecureCoding> ValueTypeProperty { get; }

// -(ValueType _Nullable)getValueTypeMethod;
[NullAllowed, Export ("getValueTypeMethod")]
[Verify (MethodToProperty)]
NSObject<NSCopying, NSSecureCoding> ValueTypeMethod { get; }
NSObject<NSCopying, INSSecureCoding> ValueTypeMethod { get; }

// -(void)setValueTypeMethod:(ValueType _Nullable)obj;
[Export ("setValueTypeMethod:")]
void SetValueTypeMethod ([NullAllowed] NSObject<NSCopying, NSSecureCoding> obj);
void SetValueTypeMethod ([NullAllowed] NSObject<NSCopying, INSSecureCoding> obj);
}
Comment on lines -9 to 19
Copy link
Copy Markdown
Member

@dalexsoto dalexsoto Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rolfbjarne This is interesting, so we have some inconsistencies in protocols?

Image

While INSSecureCoding is correct, why is NSCopying not getting picked to be INSCopying?


// @protocol A
Expand Down
6 changes: 3 additions & 3 deletions tests/sharpie/Tests/ObjCGenerics.macosx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
interface CNLabeledValue : INSCopying, INSSecureCoding {
// @property (readonly, copy, nonatomic) ValueType ValueTypeProperty;
[Export ("ValueTypeProperty", ArgumentSemantic.Copy)]
NSObject<NSCopying, NSSecureCoding> ValueTypeProperty { get; }
NSObject<NSCopying, INSSecureCoding> ValueTypeProperty { get; }

// -(ValueType _Nullable)getValueTypeMethod;
[NullAllowed, Export ("getValueTypeMethod")]
[Verify (MethodToProperty)]
NSObject<NSCopying, NSSecureCoding> ValueTypeMethod { get; }
NSObject<NSCopying, INSSecureCoding> ValueTypeMethod { get; }

// -(void)setValueTypeMethod:(ValueType _Nullable)obj;
[Export ("setValueTypeMethod:")]
void SetValueTypeMethod ([NullAllowed] NSObject<NSCopying, NSSecureCoding> obj);
void SetValueTypeMethod ([NullAllowed] NSObject<NSCopying, INSSecureCoding> obj);
}

// @protocol A
Expand Down
4 changes: 4 additions & 0 deletions tools/sharpie/Sharpie.Bind/Massagers/PlatformTypeMappingMassager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,15 @@ public override void VisitTypeOfExpression (TypeOfExpression typeOfExpression)

public override void VisitMemberType (MemberType memberType)
{
// Visit children first so that type arguments (e.g. inside Action<NSData, NSURLResponse>)
// are mapped before the parent type is processed.
base.VisitMemberType (memberType);
VisitType (memberType, memberType.MemberName);
}

public override void VisitSimpleType (SimpleType simpleType)
{
base.VisitSimpleType (simpleType);
VisitType (simpleType, simpleType.Identifier);
}

Expand Down
Loading