Merge pull request #3615 from djspiewak/bug/continuing-failure

Fixed issue in which failing `uncancelable` would remain masked for one stage
typelevel · May 12, 2023 · a4d76cd · a4d76cd
2 parents 9236fb4 + cb2b179
commit a4d76cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/shared/src/main/scala/cats/effect/IOFiber.scala b/core/shared/src/main/scala/cats/effect/IOFiber.scala
@@ -534,7 +534,7 @@ private final class IOFiber[A](
             try cur.body(poll)
             catch {
               case t if NonFatal(t) =>
-                failed(t, 0)
+                IO.raiseError(t)
               case t: Throwable =>
                 onFatalFailure(t)
             }

diff --git a/tests/shared/src/test/scala/cats/effect/IOSpec.scala b/tests/shared/src/test/scala/cats/effect/IOSpec.scala
@@ -1317,6 +1317,11 @@ class IOSpec extends BaseSpec with Discipline with IOPlatformSpecification {
       "catch stray exceptions in uncancelable" in ticked { implicit ticker =>
         IO.uncancelable[Unit](_ => throw new RuntimeException).voidError must completeAs(())
       }
+
+      "unmask following stray exceptions in uncancelable" in ticked { implicit ticker =>
+        IO.uncancelable[Unit](_ => throw new RuntimeException)
+          .handleErrorWith(_ => IO.canceled *> IO.never) must selfCancel
+      }
     }
 
     "finalization" should {