switch to using CSTRMarshaller instead of AnsiBSTR by mangod9 · Pull Request #55032 · dotnet/runtime

mangod9 · 2021-07-01T19:04:35Z

cc @dotnet/crossgen-contrib @MichalStrehovsky

mangod9 · 2021-07-01T19:09:45Z

+
+ bool bPassByValueInOnly = In && !Out && !IsManagedByRef;
+ ILLocalVariable localBuffer = emitter.NewLocal(Context.GetWellKnownType(WellKnownType.IntPtr));
+ if (bPassByValueInOnly)


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

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

mangod9 · 2021-07-02T03:31:43Z

@AaronRobinsonMSFT as well.. perhaps we should just fix the out string case for now and refactor these helpers in 7.

AaronRobinsonMSFT · 2021-07-02T05:27:32Z

/cc @jkoritzinsky @elinor-fung

Updated the cleanup logic to the one implemented in ILOptimizedAllocMarshaler::EmitClearNative

mangod9 · 2021-07-02T16:48:36Z

crossgen2 outerloop failures are comparable to main runs.

mangod9 · 2021-07-06T18:31:33Z

@VSadov since we saw this show up as part of this issue: #54759. Any comments / concerns with this change?

Wonder how we hadn't seen any previous issues here since libraries have been compiled using cg2 for a few previews now and a simple interop call with out string should hit this case.

VSadov · 2021-07-06T19:05:15Z

@mangod9 - the fix look reasonable and the issue is very likely the same as one observed in #54759.

As for why we have not seen this sooner - maybe seeing a combination of "out" parameters in interop scenario, on Linux, with crossgen2 just took time to observe...

MichalStrehovsky · 2021-07-07T08:12:22Z

Do we need a regression test?

mangod9 · 2021-07-07T13:02:06Z

yeah I am hoping there are some interop tests already covering out string scenario which we could add to the r2r pipeline. @AaronRobinsonMSFT @jkoritzinsky @elinor-fung do you happen to know if any exist?

jkotas · 2021-07-07T13:33:12Z

We have a lot of tests for this. The problem is that the interop stub generation in crossgen is currently only enabled for CoreLib, so it is impossible to test.

We would need to enable it for everything in CoreLib version bubble to make it testable by changing this to if (_versionBubbleModuleSet.Contains(method.Context.SystemModule)).

mangod9 · 2021-07-07T13:42:27Z

which is being done in this PR: #54847? So a combination of the two PRs (without skipping AnsiStringMarshaller) would suffice?

jkotas · 2021-07-07T14:10:28Z

Yes, assuming we have appropriate large version bubble test leg.

mangod9 · 2021-07-08T17:12:06Z

with the latest change I am hitting an issue similar to this: #51189. so more of these marshallers would need updates to work with R2R

jkotas · 2021-07-08T19:40:19Z

I would recommend undoing the last change, and deal with the testing later.

We need a unified intentionally designed set of helpers for marshalling strings that are shared between runtime-generated, crossgen-generated and source-generated interop.

mangod9 · 2021-07-08T20:24:13Z

I would recommend undoing the last change, and deal with the testing later.

yeah that seems like the best approach to get this merged. Will revert that change.

This reverts commit 8575306.

mangod9 · 2021-07-09T03:46:12Z

ok, CI is good now. crossgen2-composite failures are at par with main.

MichalStrehovsky · 2021-07-09T08:59:02Z

Btw, disabling the Utf8Marshaller would be as simple as deleting these two lines:

runtime/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Interop/IL/Marshaller.ReadyToRun.cs

Lines 28 to 29 in d431d6a

caseMarshallerKind.UTF8String:
returnnewUTF8StringMarshaller();

. I don't think Utf8Marshaller as it is right now works with crossgen2 at all.

Looks like all of this slipped through the cracks because nobody realized it's pretty much not exercised by anything.

mangod9 · 2021-07-09T18:03:43Z

yeah will do that as a separate change. Believe there are other ones (like UnicodeString) which need to excluded for R2R.

mangod9 · 2021-07-09T22:08:54Z

Any other concerns with this?

MichalStrehovsky

Looks good otherwise.

mangod9 added 2 commits July 1, 2021 11:57

switch to using CSTRMarshaller instead of AnsiBSTR
42ff51a

cleanup
821aece

mangod9 added the area-ReadyToRun label Jul 1, 2021

mangod9 commented Jul 1, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs

mangod9 commented Jul 1, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs

mangod9 commented Jul 1, 2021
View reviewed changes

Add CleanupManaged back
39f17b8
Updated the cleanup logic to the one implemented in ILOptimizedAllocMarshaler::EmitClearNative

jkotas reviewed Jul 2, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs Outdated

CR feedback
5d24e5a

mangod9 commented Jul 6, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs Outdated

update MAX_LOCAL_BUFFER_LENGTH
f4f44c8

mangod9 changed the title ~~[WIP] switch to using CSTRMarshaller instead of AnsiBSTR~~switch to using CSTRMarshaller instead of AnsiBSTRJul 6, 2021

mangod9 mentioned this pull request Jul 8, 2021
Partially allow marshalling ILSTUB compilation for ndirect methods using crossgen2 if SPC.dll is in the same bubble #54847
Closed

generate stubs for all methods if corelib is within the bubble.
8575306

Revert "generate stubs for all methods if corelib is within the bubble."
a3f5ac2
This reverts commit 8575306.

runfoappBot mentioned this pull request Jul 10, 2021
Feed unreliability affecting CI #55449
Closed

MichalStrehovsky approved these changes Jul 12, 2021
View reviewed changes

Comment threadsrc/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs Outdated
Comment threadsrc/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs Outdated
Comment threadsrc/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs Outdated

mangod9 added 2 commits July 12, 2021 11:06

CR feedback
185ccc0

use wellknowntype
56f8cbe

mangod9 merged commit c7ebb65 into dotnet:mainJul 13, 2021

mangod9 deleted the usecstr branch July 13, 2021 02:49

ManickaP mentioned this pull request Jul 20, 2021
[QUIC] Remove AppContext switch from S.N.Quic #56027
Merged

agocke mentioned this pull request Aug 11, 2021
SingleFile asp.net apps throw an exception #54759
Closed

ghost locked as resolved and limited conversation to collaborators Aug 12, 2021

Uh oh!

Conversation

mangod9 commented Jul 1, 2021

Uh oh!

Uh oh!

Uh oh!

mangod9Jul 1, 2021

Choose a reason for hiding this comment

Uh oh!

jkotasJul 1, 2021

Choose a reason for hiding this comment

Uh oh!

mangod9 commented Jul 2, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AaronRobinsonMSFT commented Jul 2, 2021

Uh oh!

Uh oh!

mangod9 commented Jul 2, 2021

Uh oh!

mangod9 commented Jul 6, 2021

Uh oh!

VSadov commented Jul 6, 2021

Uh oh!

Uh oh!

MichalStrehovsky commented Jul 7, 2021

Uh oh!

mangod9 commented Jul 7, 2021

Uh oh!

jkotas commented Jul 7, 2021

Uh oh!

mangod9 commented Jul 7, 2021

Uh oh!

jkotas commented Jul 7, 2021

Uh oh!

mangod9 commented Jul 8, 2021

Uh oh!

jkotas commented Jul 8, 2021

Uh oh!

mangod9 commented Jul 8, 2021

Uh oh!

mangod9 commented Jul 9, 2021

Uh oh!

MichalStrehovsky commented Jul 9, 2021

Uh oh!

mangod9 commented Jul 9, 2021

Uh oh!

mangod9 commented Jul 9, 2021

Uh oh!

MichalStrehovsky left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mangod9 commented Jul 2, 2021•
edited
Loading