Map the disposed issue to OperationCanceledException, which should be…

… captured.
boogie-org · Aug 13, 2024 · ab87a4f · ab87a4f
1 parent 44f0dff
commit ab87a4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Source/ExecutionEngine/VerificationTask.cs b/Source/ExecutionEngine/VerificationTask.cs
@@ -116,7 +116,7 @@ public void Cancel() {
   private async IAsyncEnumerable<IVerificationStatus> StartRun([EnumeratorCancellation] CancellationToken cancellationToken) {
     var timeout = Split.Run.Implementation.GetTimeLimit(Split.Options);
 
-    var checkerTask = engine.CheckerPool.FindCheckerFor(ProcessedProgram.Program, Split, cancellationToken);
+    var checkerTask = engine.CheckerPool.FindCheckerFor(ProcessedProgram.Program, Split, CancellationToken.None);
     if (!checkerTask.IsCompleted) {
       yield return new Queued();
     }

diff --git a/Source/VCGeneration/CheckerPool.cs b/Source/VCGeneration/CheckerPool.cs
@@ -23,12 +23,12 @@ public CheckerPool(VCGenOptions options)
 
     public async Task<Checker> FindCheckerFor(Program program, Split? split, CancellationToken cancellationToken)
     {
+      if (disposed) {
+        throw new OperationCanceledException("CheckerPool was already disposed");
+      }
+
       await checkersSemaphore.WaitAsync(cancellationToken);
       try {
-        if (disposed) { // Now that should not happen
-          throw new Exception("CheckerPool was already disposed");
-        }
-
         if (!availableCheckers.TryPop(out var checker)) {
           checker ??= CreateNewChecker();
         }