Enable non-blittable struct returns on UnmanagedCallersOnly by jkoritzinsky · Pull Request #45625 · dotnet/runtime

jkoritzinsky · 2020-12-05T00:27:57Z

Now that #39294 is merged, we no longer need to require a stub when we return a non-primitive value type. This PR removes that restriction, which enabled using blittable value type returns with UnmanagedCallersOnly. This PR also enables passing the calling convention from UnmanagedCallersOnly to the JIT at both runtime and during crossgen with crossgen2. This enables the UnmanagedCallersOnly entrypoint to have the correct calling convention even though the entrypoint is technically managed.

This PR blocks crossgenning UnmangedCallersOnly methods in crossgen1 because the custom attribute parsing code is not currently included in crossgen1 and I didn't want to fight to get that hooked up since we're looking at deprecating/removing crossgen1 in the .NET 6 time frame anyway.

Fixes#35928.

…t#35928.

…e JIT. Block UnmanagedCallersOnly in crossgen1 since the attribute parsing code isn't included.

…ly in crossgen2

ViktorHofer · 2020-12-08T14:50:10Z

// Auto-generated message

69e114c which was merged 12/7 removed the intermediate src/coreclr/src/ folder. This PR needs to be updated as it touches files in that directory which causes conflicts.

To update your commits you can use this bash script: https://gist.github.com/ViktorHofer/6d24f62abdcddb518b4966ead5ef3783. Feel free to use the comment section of the gist to improve the script for others.

…lers-only-valuetype-return

jkoritzinsky · 2020-12-08T23:41:42Z

This is ready for review.

…ndle all calling convention resolution and support extensible calling conventions.

Co-authored-by: Jan Kotas <jkotas@microsoft.com>

ghost · 2020-12-14T19:35:12Z

Hello @jkoritzinsky!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

…lers-only-valuetype-return

jkotas · 2020-12-14T20:48:26Z

Could you please resolve the conflict?

jkoritzinsky · 2020-12-14T20:49:50Z

Will do!

…lers-only-valuetype-return

…eded on the entry-point functions.

…45625)" This reverts commit c64861b.

…otnet#45625)" This reverts commit c64861b.

sebastienros · 2020-12-17T17:06:27Z

I have been investigating a failing merge in aspnetcore, and isolated a repro by switching from runtimes

35fbaef
6.0.0-alpha.1.20614.9

and

c64861b
6.0.0-alpha.1.20614.10

The only commit in this range is from this PR.

Here is an example of error messages we get while running some functional tests with this runtime. All tests pass with the runtime build preceding this commit. There are other very similar ones, most related to SslStream, like "bad frame". This only happens on Linux and MacOS agents.

[xUnit.net 00:00:01.07] DATA_Sent_TooSlowlyDueToOutputFlowControlOnMultipleStreams_AbortsConnectionAfterAdditiveRateTimeout [SKIP]
Skipped DATA_Sent_TooSlowlyDueToOutputFlowControlOnMultipleStreams_AbortsConnectionAfterAdditiveRateTimeout [1 ms]
The active test run was aborted. Reason: Test host process crashed : Fatal error. System.AccessViolationException: Attempted to read or write protected memory. This is often an indication that other memory is corrupt.
at System.Net.Security.SslStream.<ThrowIfExceptional>g__ThrowExceptional|137_0(System.Runtime.ExceptionServices.ExceptionDispatchInfo)
at System.Net.Security.SslStream+<ReadAsyncInternal>d__180`1[[System.Net.Security.AsyncReadWriteAdapter, System.Net.Security, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].MoveNext()
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.Net.Security.SslStream+<ReadAsyncInternal>d__180`1[[System.Net.Security.AsyncReadWriteAdapter, System.Net.Security, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]], System.Net.Security, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].ExecutionContextCallback(System.Object)
at System.Threading.ExecutionContext.RunInternal(System.Threading.ExecutionContext, System.Threading.ContextCallback, System.Object)
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.Net.Security.SslStream+<ReadAsyncInternal>d__180`1[[System.Net.Security.AsyncReadWriteAdapter, System.Net.Security, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]], System.Net.Security, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].MoveNext(System.Threading.Thread)
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.Net.Security.SslStream+<ReadAsyncInternal>d__180`1[[System.Net.Security.AsyncReadWriteAdapter, System.Net.Security, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]], System.Net.Security, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].MoveNext()
at System.Runtime.CompilerServices.TaskAwaiter+<>c.<OutputWaitEtwEvents>b__12_0(System.Action, System.Threading.Tasks.Task)
at System.Runtime.CompilerServices.AsyncMethodBuilderCore+ContinuationWrapper.Invoke()
at System.Threading.Tasks.AwaitTaskContinuation.RunOrScheduleAction(System.Action, Boolean)
at System.Threading.Tasks.Task.RunContinuations(System.Object)
at System.Threading.Tasks.Task.FinishContinuations()
at System.Threading.Tasks.Task`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].TrySetResult(Int32)
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].SetExistingTaskResult(System.Threading.Tasks.Task`1<Int32>, Int32)
at System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].SetResult(Int32)
at Microsoft.AspNetCore.Server.Kestrel.Core.Internal.DuplexPipeStream+<ReadAsyncInternal>d__27.MoveNext()
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.__Canon, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].ExecutionContextCallback(System.Object)
at System.Threading.ExecutionContext.RunFromThreadPoolDispatchLoop(System.Threading.Thread, System.Threading.ExecutionContext, System.Threading.ContextCallback, System.Object)
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.__Canon, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].MoveNext(System.Threading.Thread)
at System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1+AsyncStateMachineBox`1[[System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.__Canon, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].ExecuteFromThreadPool(System.Threading.Thread)
at System.Threading.ThreadPoolWorkQueue.Dispatch()
at System.Threading.PortableThreadPool+WorkerThread.WorkerThreadStart()
at System.Threading.ThreadHelper.ThreadStart_Context(System.Object)
at System.Threading.ExecutionContext.RunInternal(System.Threading.ExecutionContext, System.Threading.ContextCallback, System.Object)
at System.Threading.ThreadHelper.ThreadStart()

Do you think there could be a reason for this change to be responsible?

To reproduce, I cloned aspnetcore, updated the Versions.props file with specific runtime versions, and ran:

/src/Servers/Kestrel$ > ./build.sh; ../../../.dotnet/dotnet vstest ../../../artifacts/bin/InMemory.FunctionalTests/Debug/net6.0/InMemory.FunctionalTests.dll

jkoritzinsky · 2020-12-17T17:14:48Z

Yes there was a bug in this change that we fixed last night. The next Maestro update should have the fix.

sebastienros · 2020-12-17T17:15:36Z

Awesome, thanks for the quick feedback

Fix issue introduced in dotnet#45625

Fix issue introduced in #45625

jkoritzinsky added 3 commits December 3, 2020 16:54

Allow non-primitive struct returns to not require a stub.Fixesdotne…
0302e18
…t#35928.

Support propagating the UnmanagedCallersOnly calling convention to th…
ee5264f
…e JIT. Block UnmanagedCallersOnly in crossgen1 since the attribute parsing code isn't included.

Support passing through the calling convention for UnmanagedCallersOn…
96e5e0f
…ly in crossgen2

jkoritzinsky added the area-Interop-coreclr label Dec 5, 2020

jkoritzinsky added this to the 6.0.0 milestone Dec 5, 2020

jkoritzinsky requested review from AaronRobinsonMSFT, elinor-fung and jkotas December 5, 2020 00:27

Fix clang errors.
1b3ed1a

jkoritzinsky force-pushed the unmanaged-callers-only-valuetype-return branch from 07215bd to 1b3ed1aCompare December 5, 2020 00:50

jkotas reviewed Dec 5, 2020
View reviewed changes

Comment threadsrc/coreclr/src/tools/Common/JitInterface/CorInfoImpl.cs Outdated

AaronRobinsonMSFT reviewed Dec 5, 2020
View reviewed changes

Comment threadsrc/coreclr/src/tools/Common/JitInterface/CorInfoImpl.cs Outdated
Comment threadsrc/coreclr/src/vm/jitinterface.cpp
Comment threadsrc/coreclr/src/vm/jitinterface.cpp Outdated

jkoritzinsky added 6 commits December 7, 2020 10:50

Fix stack calculation.
79b5916

Fix usings
2723dc6

Clean up jitinterface.
d0e811b

Remove invalid assert.
5d83953

Fix up stdcall name mangling lookup.
6fe0f4e

Fix flag condition.
2e3fecc

jkoritzinsky added 5 commits December 8, 2020 10:23

Merge branch 'master' of github.com:dotnet/runtime into unmanaged-cal…
7fa08ca
…lers-only-valuetype-return

Use the register var type when copying from the register to the stack.
e2a9d40

Change flag check for readability.
74a69e5

Rename variables to remove shadowing.
c12cc51

Fix formatting.
6345e3e

jkotas reviewed Dec 9, 2020
View reviewed changes

Comment threadsrc/coreclr/vm/jitinterface.cpp Outdated

Create new getEntryPointCallConv method on the EE-JIT interface to ha…
f08c166
…ndle all calling convention resolution and support extensible calling conventions.

jkotas reviewed Dec 9, 2020
View reviewed changes

Comment threadsrc/coreclr/inc/corinfo.h

jkotas reviewed Dec 9, 2020
View reviewed changes

Comment threadsrc/coreclr/vm/jitinterface.cpp Outdated

jkotas reviewed Dec 9, 2020
View reviewed changes

Comment threadsrc/coreclr/vm/jitinterface.cpp Outdated

Update src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
3d5c8e2
Co-authored-by: Jan Kotas <jkotas@microsoft.com>

jkoritzinsky added the auto-merge label Dec 14, 2020

Merge branch 'master' of github.com:dotnet/runtime into unmanaged-cal…
05e4efe
…lers-only-valuetype-return

runfoappBot mentioned this pull request Dec 14, 2020
Mono System.Text.Json.Tests on Windows timing out #42677
Open

jkoritzinsky added 2 commits December 14, 2020 13:58

Fix SigTypeContext creation.
dead19d

Merge branch 'master' of github.com:dotnet/runtime into unmanaged-cal…
6465ce0
…lers-only-valuetype-return

jkotas reviewed Dec 14, 2020
View reviewed changes

Comment threadsrc/coreclr/vm/jitinterface.cpp Outdated

jkoritzinsky added 3 commits December 14, 2020 14:47

Pass context by ptr.
6a4cbeb

Fix formatting.
6b870e6

Clear the Reverse P/Invoke flag when compiling inlinees. It's only ne…
792d56f
…eded on the entry-point functions.

jkoritzinsky merged commit c64861b into dotnet:masterDec 15, 2020

jkoritzinsky deleted the unmanaged-callers-only-valuetype-return branch December 15, 2020 06:26

runfoappBot mentioned this pull request Dec 15, 2020
Inability to unzip assets during build on Unix x64 #32805
Closed

safern added a commit that referenced this pull request Dec 16, 2020
Revert "Enable non-blittable struct returns on UnmanagedCallersOnly (#…
33b7d29
…45625)" This reverts commit c64861b.

safern added a commit to safern/runtime that referenced this pull request Dec 16, 2020
Revert "Enable non-blittable struct returns on UnmanagedCallersOnly (d…
922e12b
…otnet#45625)" This reverts commit c64861b.

safern mentioned this pull request Dec 16, 2020
Revert "Enable non-blittable struct returns on UnmanagedCallersOnly (#45625)" #46172
Closed

jkoritzinsky mentioned this pull request Dec 17, 2020
Use destType for size instead of srcType when writing a variable from a register to the stack. #46176
Merged

mangod9 mentioned this pull request Dec 17, 2020
[master] Update dependencies from dotnet/runtime dotnet/sdk#14574
Merged

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Dec 17, 2020
Fix crash in SuperPMI getUnmanagedCallConv
6828a91
Fix issue introduced in dotnet#45625

BruceForstall mentioned this pull request Dec 17, 2020
Fix crash in SuperPMI getUnmanagedCallConv #46202
Merged

BruceForstall added a commit that referenced this pull request Dec 18, 2020
Fix crash in SuperPMI getUnmanagedCallConv (#46202)
5ef9a24
Fix issue introduced in #45625

sandreenko mentioned this pull request Dec 19, 2020
wrong multireg copies from reg to small type field in memory #46240
Closed

danmoseley mentioned this pull request Jan 3, 2021
Assert failure(PID 5984 [0x00001760], Thread: 1888 [0x0760]): CONTRACT VIOLATION by CallCountingManager::OnCallCountThresholdReached within calls to KERNELBASE! EnumCalendarInfoExEx #46512
Closed

ghost locked as resolved and limited conversation to collaborators Jan 16, 2021

Navigation Menu

Uh oh!

Enable non-blittable struct returns on UnmanagedCallersOnly - #45625

Enable non-blittable struct returns on UnmanagedCallersOnly#45625
jkoritzinsky merged 42 commits into
dotnet:masterfrom
jkoritzinsky:unmanaged-callers-only-valuetype-return

jkoritzinsky commented Dec 5, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ViktorHofer commented Dec 8, 2020

Uh oh!

jkoritzinsky commented Dec 8, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ghost commented Dec 14, 2020

Uh oh!

jkotas commented Dec 14, 2020

Uh oh!

jkoritzinsky commented Dec 14, 2020

Uh oh!

Uh oh!

sebastienros commented Dec 17, 2020

Uh oh!

jkoritzinsky commented Dec 17, 2020

Uh oh!

sebastienros commented Dec 17, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

jkoritzinsky commented Dec 5, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ViktorHofer commented Dec 8, 2020

Uh oh!

jkoritzinsky commented Dec 8, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ghost commented Dec 14, 2020

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

Uh oh!

jkotas commented Dec 14, 2020

Uh oh!

jkoritzinsky commented Dec 14, 2020

Uh oh!

Uh oh!

sebastienros commented Dec 17, 2020

Uh oh!

jkoritzinsky commented Dec 17, 2020

Uh oh!

sebastienros commented Dec 17, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.