Avoid GetFunctionForDelegate call in delegate vtables #1971
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
…ing of the same vtable ptr for nullable support.
Sergio0694
approved these changes
Apr 8, 2025
| @@ -2421,7 +2474,7 @@ public static ComWrappers.ComInterfaceEntry[] GetExposedInterfaces(ComWrappers.C | |||
| entries[count++] = new ComWrappers.ComInterfaceEntry | |||
| { | |||
| IID = PIID, | |||
| Vtable = ABI.System.Nullable_Delegate<T>.AbiToProjectionVftablePtr | |||
| Vtable = ABI.System.Nullable_Delegate.AbiToProjectionVftablePtr | |||
There was a problem hiding this comment.
With this change, when will the generic vtable be used on NAOT? Could we drop that cctor? 🤔
There was a problem hiding this comment.
We might be able to drop it, but I will defer on that to future PR.
| @@ -1919,6 +1920,51 @@ public static unsafe Nullable GetValue(IInspectable inspectable) | |||
| } | |||
| } | |||
|
|
|||
| [Guid("61C17706-2D65-11E0-9AE8-D48564015472")] | |||
There was a problem hiding this comment.
What's the point of this guid and the one on the generic one? Each IReference<T> interface will have its own IID, so what does this one represent, and when is it used?
There was a problem hiding this comment.
This is actually not used, but represents IReference.
There was a problem hiding this comment.
Will remove this in future PR too.
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.
We saw when code mitigations are enabled to disable dynamic code,
GetFunctionPointerForDelegatewill run into issues. This is the first step to remove its usage specifically in delegate scenarios. We achieve this by using the same vtable for IReference which was the only scenario that needed it and instead as part of the shared implementation look up the registered IID which is the only reason why we couldn't share vtables before.