Skip to content

Fix marshalling null delegates #241

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
jkotas merged 3 commits into from
Nov 25, 2019
Merged

Fix marshalling null delegates #241

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b8318e
Fix marshalling null delegates
MichalStrehovsky Nov 24, 2019
f05afa4
Merge branch 'master' of https://github.com/dotnet/runtime into fixDe…
MichalStrehovsky Nov 25, 2019
6158606
Oops
MichalStrehovsky Nov 25, 2019
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
25 changes: 25 additions & 0 deletions src/coreclr/src/tools/Common/TypeSystem/Interop/IL/Marshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,20 +1824,38 @@ class DelegateMarshaller : Marshaller
{
protected override void AllocAndTransformManagedToNative(ILCodeStream codeStream)
{
ILCodeLabel lNullPointer = _ilCodeStreams.Emitter.NewCodeLabel();
ILCodeLabel lDone = _ilCodeStreams.Emitter.NewCodeLabel();

LoadManagedValue(codeStream);
codeStream.Emit(ILOpcode.dup);
codeStream.Emit(ILOpcode.brfalse, lNullPointer);

codeStream.Emit(ILOpcode.call, _ilCodeStreams.Emitter.NewToken(
InteropTypes.GetMarshal(Context).GetKnownMethod("GetFunctionPointerForDelegate",
new MethodSignature(MethodSignatureFlags.Static, 0, Context.GetWellKnownType(WellKnownType.IntPtr),
new TypeDesc[] { Context.GetWellKnownType(WellKnownType.MulticastDelegate).BaseType }
))));

codeStream.Emit(ILOpcode.br, lDone);

codeStream.EmitLabel(lNullPointer);
codeStream.Emit(ILOpcode.pop);
codeStream.EmitLdc(0);
codeStream.Emit(ILOpcode.conv_i);

codeStream.EmitLabel(lDone);
StoreNativeValue(codeStream);
Copy link
Copy Markdown
Member

@jkotas jkotas Nov 24, 2019

Choose a reason for hiding this comment

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

StoreNativeValue expects value of the right type on the IL stack. We do not have value of the right type on the IL stack here for the null case.

Copy link
Copy Markdown
Member Author

@MichalStrehovsky MichalStrehovsky Nov 25, 2019

Choose a reason for hiding this comment

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

Sigh, wanted to avoid the branching dance so hard I missed this...

}

protected override void TransformNativeToManaged(ILCodeStream codeStream)
{
ILCodeLabel lNullPointer = _ilCodeStreams.Emitter.NewCodeLabel();
ILCodeLabel lDone = _ilCodeStreams.Emitter.NewCodeLabel();

LoadNativeValue(codeStream);
codeStream.Emit(ILOpcode.dup);
codeStream.Emit(ILOpcode.brfalse, lNullPointer);

TypeDesc systemType = Context.SystemModule.GetKnownType("System", "Type");

Expand All @@ -1850,6 +1868,13 @@ protected override void TransformNativeToManaged(ILCodeStream codeStream)
new TypeDesc[] { Context.GetWellKnownType(WellKnownType.IntPtr), systemType }
))));

codeStream.Emit(ILOpcode.br, lDone);

codeStream.EmitLabel(lNullPointer);
codeStream.Emit(ILOpcode.pop);
codeStream.Emit(ILOpcode.ldnull);

codeStream.EmitLabel(lDone);
StoreManagedValue(codeStream);
}

Expand Down