Don't reuse a ValueTask

DataDog · Jan 8, 2025 · a73c2c7 · a73c2c7
1 parent c96ac50
commit a73c2c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...r/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskActivator`1.cs b/...r/src/Datadog.Trace/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskActivator`1.cs
@@ -90,5 +90,7 @@ internal static TValueTask FallbackResultActivator(TResult task)
         => (TValueTask)Activator.CreateInstance(typeof(TValueTask), task)!;
 
     public static TValueTask CreateInstance(Task<TResult> task) => TaskActivator(task);
+
+    public static TValueTask CreateInstance(TResult result) => ResultActivator(result);
 }
 #endif
diff --git a/...e/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.NetFx.cs b/...e/ClrProfiler/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.NetFx.cs
@@ -80,7 +80,7 @@ public SyncCallbackHandler(ContinuationMethodDelegate continuation, bool preserv
                 // ok all good, just run synchronously
                 var unwrappedResult = previousValueTask.Result;
                 _continuation(instance, unwrappedResult, exception, in state);
-                return returnValue;
+                return ValueTaskActivator<TReturn, TResult?>.CreateInstance(unwrappedResult);
             }
 
             // uh oh, need to extract the task, await it, run the continuation