Skip to content
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

Jump to bottom

switch to using CSTRMarshaller instead of AnsiBSTR #55032

Merged
merged 9 commits into from
Jul 13, 2021
Merged

switch to using CSTRMarshaller instead of AnsiBSTR #55032

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42ff51a
switch to using CSTRMarshaller instead of AnsiBSTR
mangod9 Jul 1, 2021
821aece
cleanup
mangod9 Jul 1, 2021
39f17b8
Add CleanupManaged back
mangod9 Jul 2, 2021
5d24e5a
CR feedback
mangod9 Jul 2, 2021
f4f44c8
update MAX_LOCAL_BUFFER_LENGTH
mangod9 Jul 6, 2021
8575306
generate stubs for all methods if corelib is within the bubble.
mangod9 Jul 8, 2021
a3f5ac2
Revert "generate stubs for all methods if corelib is within the bubble."
mangod9 Jul 8, 2021
185ccc0
CR feedback
mangod9 Jul 12, 2021
56f8cbe
use wellknowntype
mangod9 Jul 12, 2021
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
91 changes: 87 additions & 4 deletions src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,10 @@ protected override void EmitCleanupManaged(ILCodeStream codeStream)

class AnsiStringMarshaller : Marshaller
{
const int MAX_LOCAL_BUFFER_LENGTH = 256; // TODO: Is this accurate on all platforms?
mangod9 marked this conversation as resolved.
Show resolved Hide resolved

private ILLocalVariable m_localBuffer = default;
mangod9 marked this conversation as resolved.
Show resolved Hide resolved

internal override bool CleanupRequired
mangod9 marked this conversation as resolved.
Show resolved Hide resolved
{
get
Expand All @@ -1605,20 +1609,82 @@ protected override void TransformManagedToNative(ILCodeStream codeStream)

#if READYTORUN
mangod9 marked this conversation as resolved.
Show resolved Hide resolved
var stringToAnsi =
Context.SystemModule.GetKnownType("System.StubHelpers", "AnsiBSTRMarshaler")
Context.SystemModule.GetKnownType("System.StubHelpers", "CSTRMarshaler")
.GetKnownMethod("ConvertToNative", null);

bool bPassByValueInOnly = In && !Out && !IsManagedByRef;

if (bPassByValueInOnly)
Copy link
Member Author

Choose a reason for hiding this comment

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

is there a reason why this logic cant move to System.StubHelpers.CSTRMarshaler ?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it would be nice to have majority of the logic in C#, and minimize amount of the hand-emitted IL.

{
var bufSize = emitter.NewLocal(Context.GetWellKnownType(WellKnownType.Int32));
m_localBuffer = emitter.NewLocal(Context.GetWellKnownType(WellKnownType.IntPtr));

// LocalBuffer = 0
codeStream.Emit(ILOpcode.ldnull);
codeStream.EmitStLoc(m_localBuffer);

var noOptimize = emitter.NewCodeLabel();

// if == NULL, goto NoOptimize
LoadManagedValue(codeStream);
codeStream.Emit(ILOpcode.brfalse, noOptimize);

// String.Length + 2
LoadManagedValue(codeStream);
var stringLen =
Context.SystemModule.GetKnownType("System", "String")
mangod9 marked this conversation as resolved.
Show resolved Hide resolved
.GetKnownMethod("get_Length", null);
codeStream.Emit(ILOpcode.call, emitter.NewToken(stringLen));
codeStream.EmitLdc(2);
codeStream.Emit(ILOpcode.add);

// (String.Length + 2) * GetMaxDBCSCharByteSize()
codeStream.Emit(ILOpcode.ldsfld, emitter.NewToken(Context.SystemModule.GetKnownType(
"System.Runtime.InteropServices","Marshal")
.GetKnownField("SystemMaxDBCSCharSize")));
codeStream.Emit(ILOpcode.mul_ovf);

// BufSize = (String.Length + 2) * GetMaxDBCSCharByteSize()
codeStream.EmitStLoc(bufSize);

// if (MAX_LOCAL_BUFFER_LENGTH < BufSize ) goto NoOptimize
codeStream.EmitLdc(MAX_LOCAL_BUFFER_LENGTH + 1);
codeStream.EmitLdLoc(bufSize);
codeStream.Emit(ILOpcode.clt);
codeStream.Emit(ILOpcode.brtrue, noOptimize);

// LocalBuffer = localloc(BufSize);
codeStream.EmitLdLoc(bufSize);
codeStream.Emit(ILOpcode.localloc);
codeStream.EmitStLoc(m_localBuffer);

// NoOptimize:
codeStream.EmitLabel(noOptimize);
}

int flags = (PInvokeFlags.BestFitMapping ? 0x1 : 0)
| (PInvokeFlags.ThrowOnUnmappableChar ? 0x100 : 0);

// CSTRMarshaler.ConvertToNative pManaged, dwAnsiMarshalFlags, pLocalBuffer
codeStream.EmitLdc(flags);
LoadManagedValue(codeStream);

if (m_localBuffer != default)
{
codeStream.EmitLdLoc(m_localBuffer);
}
else
{
codeStream.Emit(ILOpcode.ldnull);
}

codeStream.Emit(ILOpcode.call, emitter.NewToken(stringToAnsi));
#else
LoadManagedValue(codeStream);
var stringToAnsi = Context.GetHelperEntryPoint("InteropHelpers", "StringToAnsiString");

codeStream.Emit(PInvokeFlags.BestFitMapping ? ILOpcode.ldc_i4_1 : ILOpcode.ldc_i4_0);
codeStream.Emit(PInvokeFlags.ThrowOnUnmappableChar ? ILOpcode.ldc_i4_1 : ILOpcode.ldc_i4_0);

codeStream.Emit(ILOpcode.call, emitter.NewToken(stringToAnsi));
#endif

Expand All @@ -1631,7 +1697,7 @@ protected override void TransformNativeToManaged(ILCodeStream codeStream)

#if READYTORUN
var ansiToString =
Context.SystemModule.GetKnownType("System.StubHelpers", "AnsiBSTRMarshaler")
Context.SystemModule.GetKnownType("System.StubHelpers", "CSTRMarshaler")
.GetKnownMethod("ConvertToManaged", null);
#else
var ansiToString = Context.GetHelperEntryPoint("InteropHelpers", "AnsiStringToString");
Expand All @@ -1645,11 +1711,28 @@ protected override void EmitCleanupManaged(ILCodeStream codeStream)
{
var emitter = _ilCodeStreams.Emitter;
#if READYTORUN
var optimize = emitter.NewCodeLabel();

MethodDesc clearNative =
Context.SystemModule.GetKnownType("System.StubHelpers", "AnsiBSTRMarshaler")
Context.SystemModule.GetKnownType("System.StubHelpers", "CSTRMarshaler")
.GetKnownMethod("ClearNative", null);

if (m_localBuffer != default)
{
// if (m_dwLocalBuffer) goto Optimize
codeStream.EmitLdLoc(m_localBuffer);
codeStream.Emit(ILOpcode.brtrue, optimize);
}

LoadNativeValue(codeStream);
// static void m_idClearNative(IntPtr ptr)
codeStream.Emit(ILOpcode.call, emitter.NewToken(clearNative));

// Optimize:
if (m_localBuffer != default)
{
codeStream.EmitLabel(optimize);
}
#else
var lNullCheck = emitter.NewCodeLabel();

Expand Down