This repository was archived by the owner on Nov 1, 2020. It is now read-only.
Merged
Conversation
This change contains the following bug fixes: * Call GC.KeepAlive for delegate marshalling. Sergiy encountered a scenario where the delegate got collected when we tried to do a reverse P/Invoke. This change adds a GC.KeepAlive at the end of the marshalling stub to ensure the delegate is not collected during the duration of the call. * For ForwardDelegateCreation Stub set the correct calling convention. Also set the IsPInvoke property of the ForwardDelegateCreation stub to be true so that the JIT flag CORJIT_FLAG_IL_STUB is set which is necessary for RyuJit to inline the call. * Handle the scenarios when MarshalAs can be null.
yizhang82
reviewed
May 3, 2017
| && MarshallerType == MarshallerType.Argument) | ||
| { | ||
| LoadManagedValue(codeStream); | ||
| codeStream.Emit(ILOpcode.call, _ilCodeStreams.Emitter.NewToken(InteropTypes.GetGC(Context).GetKnownMethod("KeepAlive", null))); |
Contributor
There was a problem hiding this comment.
Thinking about this a bit more, we should only need to emit the GC.KeepAlive call in the unmarshal stream. CoreCLR does the same thing.
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This change contains the following bug fixes:
scenario where the delegate got collected when we tried to do a reverse
P/Invoke. This change adds a GC.KeepAlive at the end of the marshalling
stub to ensure the delegate is not collected during the duration of the
call.
Also set the IsPInvoke property of the ForwardDelegateCreation stub to
be true so that the JIT flag CORJIT_FLAG_IL_STUB is set which is
necessary for RyuJit to inline the call.