Merge pull request #13944 from KacperFKorban/fix-i13941

Don't lift try-catch statements that are already in local functions
scala · Jan 23, 2022 · a018159 · a018159
2 parents 7ce60e1 + abd4998
commit a018159
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
diff --git a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala
@@ -44,6 +44,9 @@ class LiftTry extends MiniPhase with IdentityDenotTransformer { thisPhase =>
   override def prepareForApply(tree: Apply)(using Context): Context =
     liftingCtx(true)
 
+  override def prepareForDefDef(tree: DefDef)(using Context): Context =
+    liftingCtx(false)
+
   override def prepareForValDef(tree: ValDef)(using Context): Context =
     if !tree.symbol.exists
        || tree.symbol.isSelfSym

diff --git a/tests/pos/i13941.scala b/tests/pos/i13941.scala
@@ -0,0 +1,15 @@
+import scala.annotation.tailrec
+
+object A {
+  def b = Option("a").map { x =>
+    @tailrec
+    def loop(): Int = {
+      try
+        2
+      catch
+        case _: Throwable =>
+          loop()
+    }
+    x
+  }
+}