mirror of https://github.com/icsharpcode/ILSpy.git
Browse Source
Awaiting a dynamic value lowers GetAwaiter/IsCompleted/GetResult to dynamic callsites, which async decompilation could not recognize: await detection ran before DynamicCallSiteTransform, so the await was emitted as a raw state machine (or crashed in AnalyzeAwaitBlock, #1388). AnalyzeStateMachine now collapses the awaiter callsites per block, folds the runtime ICriticalNotifyCompletion branch the compiler emits for an awaiter not statically known to implement it into the canonical single call, and re-joins the branch chains the collapse leaves so each dynamic await sits in one block. DetectAwaitPattern matches the dynamic GetAwaiter/IsCompleted/GetResult shape and emits `await expr`; a synthesized dynamic GetResult method gives the await and its local the dynamic type. DynamicCallSiteTransform also follows callsite targets spilled into state-machine locals, so an awaited value flowing into a dynamic callsite (e.g. d.Result = await ..., #1928) decompiles too. Assisted-by: Claude:claude-fable-5:Claude Codepull/3878/head
Siegfried Pammer
2 months ago
committed by
Siegfried Pammer
6 changed files with 519 additions and 79 deletions
@ -0,0 +1,191 @@
@@ -0,0 +1,191 @@
|
||||
using System; |
||||
using System.Threading.Tasks; |
||||
|
||||
namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty |
||||
{ |
||||
internal class DynamicAwait |
||||
{ |
||||
private static Task DoAsync(object o) |
||||
{ |
||||
return Task.CompletedTask; |
||||
} |
||||
|
||||
private static dynamic GetDynamic() |
||||
{ |
||||
return null; |
||||
} |
||||
|
||||
private static Task<int> GetIntAsync(object o) |
||||
{ |
||||
return Task.FromResult(0); |
||||
} |
||||
|
||||
private static Task<object> GetObjAsync() |
||||
{ |
||||
return Task.FromResult<object>(null); |
||||
} |
||||
|
||||
// --- dynamic operations around a normal (real-Task) await ---
|
||||
|
||||
private static async Task SetMemberBeforeAwait(dynamic d) |
||||
{ |
||||
d.Before = 1; |
||||
await DoAsync(null); |
||||
} |
||||
|
||||
private static async Task SetMemberAfterAwait(dynamic d) |
||||
{ |
||||
await DoAsync(null); |
||||
d.After = 1; |
||||
} |
||||
|
||||
private static async Task SetMemberAroundAwait(dynamic d) |
||||
{ |
||||
d.Before = 1; |
||||
await DoAsync(null); |
||||
d.After = 2; |
||||
} |
||||
|
||||
private static async Task InvokeBeforeAwait(dynamic d) |
||||
{ |
||||
d.Before(); |
||||
await DoAsync(null); |
||||
} |
||||
|
||||
private static async Task InvokeAfterAwait(dynamic d) |
||||
{ |
||||
await DoAsync(null); |
||||
d.After(); |
||||
} |
||||
|
||||
private static async Task DynamicInLoopWithAwait(dynamic d) |
||||
{ |
||||
for (int i = 0; i < 10; i++) |
||||
{ |
||||
d.Add(i); |
||||
await DoAsync(null); |
||||
} |
||||
} |
||||
|
||||
private static async Task DynamicWhileConditionWithAwait(dynamic d) |
||||
{ |
||||
while ((bool)d.HasNext) |
||||
{ |
||||
await DoAsync(null); |
||||
} |
||||
} |
||||
|
||||
private static async Task TwoAwaitsWithDynamicBetween(dynamic d) |
||||
{ |
||||
await DoAsync(null); |
||||
d.Middle = 1; |
||||
await DoAsync(null); |
||||
} |
||||
|
||||
private static async Task DynamicConditionGuardingAwait(dynamic d) |
||||
{ |
||||
if ((bool)d.Flag) |
||||
{ |
||||
await DoAsync(null); |
||||
} |
||||
} |
||||
|
||||
private static async Task DynamicAwaitInTryCatch(dynamic d) |
||||
{ |
||||
try |
||||
{ |
||||
d.Before = 1; |
||||
await DoAsync(null); |
||||
} |
||||
catch |
||||
{ |
||||
} |
||||
} |
||||
|
||||
// --- dynamic feeding the awaited expression (awaiter stays a real Task) ---
|
||||
|
||||
private static async Task DynamicConvertedArgumentToAwaitedCall(dynamic d) |
||||
{ |
||||
await DoAsync((string)d.Value); |
||||
} |
||||
|
||||
private static async Task AwaitTaskFromDynamicCast(dynamic d) |
||||
{ |
||||
await (Task)d.GetTask(); |
||||
} |
||||
|
||||
private static async Task<int> AwaitIntTaskFromDynamicCast(dynamic d) |
||||
{ |
||||
return await (Task<int>)d.GetIntTask(); |
||||
} |
||||
|
||||
// --- awaited result feeding a dynamic operation ---
|
||||
|
||||
private static async Task StoreAwaitResultInDynamicMember(dynamic d) |
||||
{ |
||||
d.Result = await GetIntAsync(null); |
||||
} |
||||
|
||||
private static async Task PassAwaitResultToDynamicInvoke(dynamic d) |
||||
{ |
||||
d.Consume(await GetObjAsync()); |
||||
} |
||||
|
||||
private static async Task DynamicIndexerWithAwaitedIndex(dynamic d) |
||||
{ |
||||
d[await GetIntAsync(null)] = 1; |
||||
} |
||||
|
||||
private static async Task<object> DynamicBinaryOpWithAwaitedOperand(dynamic d) |
||||
{ |
||||
return d + await GetIntAsync(null); |
||||
} |
||||
|
||||
private static async Task<int> DynamicConvertOfAwaitedResult() |
||||
{ |
||||
return (int)(dynamic)(await GetObjAsync()); |
||||
} |
||||
|
||||
// --- real-world shapes from the referenced issues ---
|
||||
|
||||
// awaited dynamic stored in a dynamic local, then used (#1388)
|
||||
private static async Task<dynamic> AwaitDynamicIntoUsedLocal() |
||||
{ |
||||
dynamic val = await GetDynamic(); |
||||
val.UseMe(); |
||||
return val; |
||||
} |
||||
|
||||
// dynamic-dispatched awaited call with a dynamic-converted result (#1928)
|
||||
private static async Task<string> AwaitDynamicConvertResult(dynamic d) |
||||
{ |
||||
return (string)(await d.RunAsync()); |
||||
} |
||||
|
||||
// --- fully dynamic awaiter (the awaitable itself is dynamic) ---
|
||||
|
||||
private static async Task AwaitDynamicValue(dynamic d) |
||||
{ |
||||
await d; |
||||
} |
||||
|
||||
private static async Task AwaitDynamicMethodResult(dynamic d) |
||||
{ |
||||
await d.RunAsync(); |
||||
} |
||||
|
||||
private static async Task AwaitDynamicLocalWithStatementBefore() |
||||
{ |
||||
// Optimized builds drop the local's debug name, so the decompiler regenerates one from the type.
|
||||
#if OPT
|
||||
dynamic dynamic = GetDynamic(); |
||||
Console.WriteLine("before await"); |
||||
await dynamic; |
||||
#else
|
||||
dynamic x = GetDynamic(); |
||||
Console.WriteLine("before await"); |
||||
await x; |
||||
#endif
|
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue