Review fixes

dotnet · Feb 10, 2025 · 9c96524 · 9c96524
1 parent 7f3929e
commit 9c96524
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Compiler/Driver/CompilerImports.fs b/src/Compiler/Driver/CompilerImports.fs
@@ -2255,7 +2255,6 @@ and [<Sealed>] TcImports
             r: AssemblyResolution
         ) : Async<(_ * (unit -> AvailableImportedAssembly list)) option> =
         async {
-            use! _holder = Cancellable.UseToken()
             CheckDisposed()
             let m = r.originalReference.Range
             let fileName = r.resolvedPath
@@ -2325,8 +2324,9 @@ and [<Sealed>] TcImports
     // NOTE: When used in the Language Service this can cause the transitive checking of projects. Hence it must be cancellable.
     member tcImports.RegisterAndImportReferencedAssemblies(ctok, nms: AssemblyResolution list) =
         async {
-            CheckDisposed()
+            use! _holder = Cancellable.UseToken()
 
+            CheckDisposed()
 
             let tcConfig = tcConfigP.Get ctok
 
@@ -2475,6 +2475,8 @@ and [<Sealed>] TcImports
     // If a framework set ever includes type providers, you will not have to worry about explicitly calling Dispose as the Finalizer will handle it.
     static member BuildFrameworkTcImports(tcConfigP: TcConfigProvider, frameworkDLLs, nonFrameworkDLLs) =
         async {
+            use! _holder = Cancellable.UseToken()
+
             let ctok = CompilationThreadToken()
             let tcConfig = tcConfigP.Get ctok
 
@@ -2648,6 +2650,8 @@ and [<Sealed>] TcImports
         ) =
 
         async {
+            use! _holder = Cancellable.UseToken()
+
             let ctok = CompilationThreadToken()
             let tcConfig = tcConfigP.Get ctok
 

diff --git a/src/Compiler/Service/TransparentCompiler.fs b/src/Compiler/Service/TransparentCompiler.fs
@@ -611,8 +611,6 @@ type internal TransparentCompiler
         caches.FrameworkImports.Get(
             key,
             async {
-                use! _holder = Cancellable.UseToken()
-
                 use _ = Activity.start "ComputeFrameworkImports" []
                 let tcConfigP = TcConfigProvider.Constant tcConfig
 
@@ -637,8 +635,6 @@ type internal TransparentCompiler
         ) =
 
         async {
-            use! _holder = Cancellable.UseToken()
-
             let diagnosticsLogger =
                 CompilationDiagnosticLogger("CombineImportedAssembliesTask", tcConfig.diagnosticsOptions)