Skip to content

Fix illegal delegate usage #1328

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
merged 2 commits into from
Dec 18, 2020
Merged

Fix illegal delegate usage #1328

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d9f76f
Fix illegal delegate usage
BadSingleton Dec 17, 2020
1325f59
Use the generic method
BadSingleton Dec 18, 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
Prev Previous commit
Use the generic method
  • Loading branch information
@BadSingleton
BadSingleton committed Dec 18, 2020
commit 1325f5929bd84ca5da482cceeabdead351d39157
4 changes: 2 additions & 2 deletions src/runtime/nativecall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ internal static T GetDelegate<T>(IntPtr fp) where T: Delegate
Delegate d = null;
if (!Interop.allocatedThunks.TryGetValue(fp, out d))
{
// Use Marshal.GetDelegateForFunctionPointer<> directly after upgrade the framework
d = Marshal.GetDelegateForFunctionPointer(fp, typeof(T));
// We don't cache this delegate because this is a pure delegate ot unmanaged.
d = Marshal.GetDelegateForFunctionPointer<T>(fp);
}
return (T)d;
Copy link
Contributor

Choose a reason for hiding this comment

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

You'd save a couple instructions with:

Delegate d; // no init
if (trygetvalue(out d)) {
  return (T)d;
} else {
  return Marshal.GetDelegate...(); // no cast
}

}
Expand Down