Rename AsyncMethodDesc to AsyncMethodVariant, add "AsyncVariant" flag to MethodWithToken and MethodWithGCInfo #121218
+586
−209
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using Internal.JitInterface; | ||
|
|
||
|
|
||
| namespace Internal.TypeSystem | ||
| { | ||
| /// <summary> | ||
| /// Either the AsyncMethodImplVariant or AsyncMethodThunkVariant of a method marked .IsAsync. | ||
| /// </summary> | ||
| public partial class AsyncMethodVariant : MethodDelegator, IJitHashableOnly | ||
| { | ||
| private readonly AsyncMethodVariantFactory _factory; | ||
| private readonly AsyncMethodKind _asyncMethodKind; | ||
| private readonly int _jitVisibleHashCode; | ||
| private MethodSignature _asyncSignature; | ||
|
|
||
| public AsyncMethodVariant(MethodDesc wrappedMethod, AsyncMethodVariantFactory factory, AsyncMethodKind kind) | ||
| : base(wrappedMethod) | ||
| { | ||
| Debug.Assert(wrappedMethod.IsTaskReturning); | ||
| Debug.Assert(kind switch | ||
| { | ||
| AsyncMethodKind.AsyncVariantThunk => !wrappedMethod.IsAsync, | ||
| AsyncMethodKind.AsyncVariantImpl => wrappedMethod.IsAsync, | ||
| _ => false, | ||
| }); | ||
|
Comment on lines
+26
to
+31
There was a problem hiding this comment. Do we need the |
||
| _factory = factory; | ||
| _asyncMethodKind = kind; | ||
| _jitVisibleHashCode = HashCode.Combine(wrappedMethod.GetHashCode(), 0x310bb74f); | ||
| } | ||
|
|
||
| public MethodDesc Target => _wrappedMethod; | ||
|
|
||
| public override AsyncMethodKind AsyncMethodKind => _asyncMethodKind; | ||
|
|
||
| public override MethodSignature Signature | ||
| { | ||
| get | ||
| { | ||
| return _asyncSignature ??= _wrappedMethod.Signature.CreateAsyncSignature(); | ||
|
There was a problem hiding this comment. Inline |
||
| } | ||
| } | ||
|
|
||
| public override MethodDesc GetCanonMethodTarget(CanonicalFormKind kind) | ||
| { | ||
| return _factory.GetOrCreateAsyncMethodImplVariant(_wrappedMethod.GetCanonMethodTarget(kind), _asyncMethodKind); | ||
| } | ||
|
|
||
| public override MethodDesc GetMethodDefinition() | ||
| { | ||
| var real = _wrappedMethod.GetMethodDefinition(); | ||
| if (real == _wrappedMethod) | ||
| return this; | ||
|
|
||
| return _factory.GetOrCreateAsyncMethodImplVariant(real, _asyncMethodKind); | ||
| } | ||
|
|
||
| public override MethodDesc GetTypicalMethodDefinition() | ||
| { | ||
| var real = _wrappedMethod.GetTypicalMethodDefinition(); | ||
| if (real == _wrappedMethod) | ||
| return this; | ||
| return _factory.GetOrCreateAsyncMethodImplVariant(real, _asyncMethodKind); | ||
| } | ||
|
|
||
| public override MethodDesc InstantiateSignature(Instantiation typeInstantiation, Instantiation methodInstantiation) | ||
| { | ||
| var real = _wrappedMethod.InstantiateSignature(typeInstantiation, methodInstantiation); | ||
| if (real == _wrappedMethod) | ||
| return this; | ||
| return _factory.GetOrCreateAsyncMethodImplVariant(real, _asyncMethodKind); | ||
| } | ||
|
|
||
| public override string ToString() => $"Async variant ({_asyncMethodKind}): " + _wrappedMethod.ToString(); | ||
|
|
||
| protected override int ClassCode => throw new NotImplementedException(); | ||
|
|
||
| protected override int CompareToImpl(MethodDesc other, TypeSystemComparer comparer) | ||
| { | ||
| throw new NotImplementedException(); | ||
| } | ||
|
|
||
| protected override int ComputeHashCode() | ||
| { | ||
| throw new NotSupportedException("This method may not be stored as it is expected to only be used transiently in the JIT"); | ||
| } | ||
|
|
||
| int IJitHashableOnly.GetJitVisibleHashCode() => _jitVisibleHashCode; | ||
| } | ||
|
|
||
| public sealed class AsyncMethodVariantFactory : Dictionary<(MethodDesc, AsyncMethodKind), AsyncMethodVariant> | ||
| { | ||
| public AsyncMethodVariant GetOrCreateAsyncMethodImplVariant(MethodDesc wrappedMethod, AsyncMethodKind kind) | ||
| { | ||
| Debug.Assert(wrappedMethod.IsAsync); | ||
| if (!TryGetValue((wrappedMethod, kind), out AsyncMethodVariant variant)) | ||
| { | ||
| variant = new AsyncMethodVariant(wrappedMethod, this, kind); | ||
| this[(wrappedMethod, kind)] = variant; | ||
| } | ||
| return variant; | ||
| } | ||
|
|
||
| public AsyncMethodVariant GetOrCreateAsyncThunk(MethodDesc wrappedMethod) | ||
| { | ||
| return GetOrCreateAsyncMethodImplVariant(wrappedMethod, AsyncMethodKind.AsyncVariantThunk); | ||
| } | ||
|
|
||
| public AsyncMethodVariant GetOrCreateAsyncImpl(MethodDesc wrappedMethod) | ||
| { | ||
| return GetOrCreateAsyncMethodImplVariant(wrappedMethod, AsyncMethodKind.AsyncVariantImpl); | ||
| } | ||
| } | ||
|
|
||
| public static class AsyncMethodVariantExtensions | ||
| { | ||
| /// <summary> | ||
| /// Returns true if this MethodDesc is an AsyncMethodVariant, which should not escape the jit interface. | ||
| /// </summary> | ||
| public static bool IsAsyncVariant(this MethodDesc method) | ||
| { | ||
| return method is AsyncMethodVariant; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Gets the wrapped method of the AsyncMethodVariant. This method is Task-returning. | ||
| /// </summary> | ||
| public static MethodDesc GetAsyncVariantDefinition(this MethodDesc method) | ||
| { | ||
| return ((AsyncMethodVariant)method).Target; | ||
| } | ||
|
Comment on lines
+130
to
+136
|
||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Diagnostics; | ||
MichalStrehovsky marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| using System.Threading; | ||
|
|
||
| namespace Internal.TypeSystem | ||
| { | ||
| public sealed partial class InstantiatedMethod | ||
| { | ||
| public override AsyncMethodKind AsyncMethodKind | ||
| { | ||
| get | ||
| { | ||
| return _methodDef.AsyncMethodKind; | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be just
AsyncVariant(ie cover both Thunk or impl)?This enum is part of R2R file format. It is used to encode references to methods in other assemblies. This encoding should be resilient to compatible changes in the implementation of other assemblies. If we encode
AsyncThunkVarianthere, it does not sound like we will be resilient to the implementations in other assemblies changing between async v1 and async v2.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is
READYTORUN_METHOD_SIG_SlotInsteadOfTokenused? Could we reuse it (bumping the R2R version of course)?