wip

src/Compiler/Facilities/AsyncMemoize.fs

@@ -133,7 +133,7 @@ type private KeyData<'TKey, 'TVersion> =
         Version: 'TVersion
     }
 
-type Job<'t> = AsyncLazy<Result<'t, ExceptionDispatchInfo> * CapturingDiagnosticsLogger>
+type Job<'t> = AsyncLazy<Result<'t, exn> * CapturingDiagnosticsLogger>
 
 [<DebuggerDisplay("{DebuggerDisplay}")>]
 type internal AsyncMemoize<'TKey, 'TVersion, 'TValue when 'TKey: equality and 'TVersion: equality
@@ -153,6 +153,7 @@ type internal AsyncMemoize<'TKey, 'TVersion, 'TValue when 'TKey: equality and 'T
     let eventCounts = [for j in JobEvent.AllEvents -> j, ref 0] |> dict
     let mutable hits = 0
     let mutable duration = 0L
+    let mutable events_in_flight = 0
 
     let keyTuple (keyData: KeyData<_, _>) = keyData.Label, keyData.Key, keyData.Version
 
@@ -194,12 +195,11 @@ type internal AsyncMemoize<'TKey, 'TVersion, 'TValue when 'TKey: equality and 'T
                     let! result = computation
                     log Finished key
                     Interlocked.Add(&duration, sw.ElapsedMilliseconds) |> ignore
-                    return (Result.Ok result), logger
+                    return Result.Ok result, logger
                 with
                 | ex ->
                     log Failed key
-                    let edi = ExceptionDispatchInfo.Capture(ex)
-                    return Result.Error edi, logger
+                    return Result.Error ex, logger
             }
 
         let getOrAdd () =
@@ -232,9 +232,8 @@ type internal AsyncMemoize<'TKey, 'TVersion, 'TValue when 'TKey: equality and 'T
             match result with
             | Ok result ->
                 return result
-            | Error edi ->
-                edi.Throw()
-                return raise edi.SourceException
+            | Error ex ->
+                return raise ex
         }
 
     member _.TryGet(key: 'TKey, predicate: 'TVersion -> bool) : 'TValue option =