Skip to content

[mono] Pass delegate target when using CreateDelegate #40321

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
BrzVlad merged 2 commits into from
Aug 5, 2020
Merged

[mono] Pass delegate target when using CreateDelegate #40321

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
f58a3b0
Pass delegate target when using CreateDelegate
BrzVlad Aug 4, 2020
05c3b9f
[tests] Add test that checks `this` with CreateDelegate API
BrzVlad Aug 4, 2020
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
10 changes: 10 additions & 0 deletions src/libraries/System.Runtime/tests/System/DelegateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,10 @@ public static void CreateDelegate2()
e = (E)Delegate.CreateDelegate(typeof(E), new C(), "DoExecute");
Assert.NotNull(e);
Assert.Equal(102, e(new C()));

e = (E)Delegate.CreateDelegate(typeof(E), new B() { field = 42 }, "GetField");
Assert.NotNull(e);
Assert.Equal(42, e(new C()));
}

[Fact]
Expand Down Expand Up @@ -1103,6 +1107,7 @@ public static void CreateDelegate9_Type_Null()

public class B
{
public int field;

public virtual string retarg3(string s)
{
Expand Down Expand Up @@ -1136,6 +1141,11 @@ public int StartExecute(C c, B b)
{
return 3;
}

public int GetField(C c)
{
return field;
}
}

public class C : B, Iface
Expand Down
2 changes: 1 addition & 1 deletion src/mono/netcore/System.Private.CoreLib/src/System/Delegate.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public static Delegate CreateDelegate(Type type, object? firstArgument, MethodIn
return null;
}

return CreateDelegate_internal(type, null, info, throwOnBindFailure);
return CreateDelegate_internal(type, target, info, throwOnBindFailure);
}

[RequiresUnreferencedCode("The target method might be removed")]
Expand Down