Apply fixes from T-Gro to avoid NRE

safesparrow · safesparrow · commit dcfea0498d67 · 2022-10-11T08:50:38.000+01:00
diff --git a/src/Compiler/Facilities/Activity.fs b/src/Compiler/Facilities/Activity.fs
@@ -4,6 +4,7 @@ namespace FSharp.Compiler.Diagnostics
 
 open System
 open System.Diagnostics
+open Internal.Utilities.Library
 
 [<RequireQualifiedAccess>]
 module Activity =
@@ -12,12 +13,14 @@ module Activity =
     let private activitySource = new ActivitySource(activitySourceName)
 
     let start name (tags: (string * string) seq) : IDisposable =
-        match activitySource.StartActivity(name) |> Option.ofObj with
-        | Some activity ->
+        let activity = activitySource.StartActivity(name)
+
+        match activity with
+        | null -> ()
+        | activity -> 
             for key, value in tags do
                 activity.AddTag(key, value) |> ignore
 
-            activity :> IDisposable
-        | None -> null
+        activity
 
     let startNoTags name : IDisposable = activitySource.StartActivity(name)
diff --git a/src/Compiler/Utilities/illib.fs b/src/Compiler/Utilities/illib.fs
@@ -997,7 +997,7 @@ type CancellableBuilder() =
 
             match compRes with
             | ValueOrCancelled.Value res ->
-                (resource :> IDisposable).Dispose()
+                Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicFunctions.Dispose resource
 
                 match res with
                 | Choice1Of2 r -> ValueOrCancelled.Value r
