Fix #20145: bugfix when a return tailrec is called inside a val def. (#…

…20652)
scala · Jun 20, 2024 · 56e6f9f · 56e6f9f
2 parents 24efe7d + 036b86b
commit 56e6f9f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala
@@ -430,8 +430,8 @@ class TailRec extends MiniPhase {
           tree
 
         case tree: ValDef =>
-          if (isMandatory) noTailTransform(tree.rhs)
-          tree
+          // This could contain a return statement in a code block, so we do have to go into it.
+          cpy.ValDef(tree)(rhs = noTailTransform(tree.rhs))
 
         case tree: DefDef =>
           if (isMandatory)

diff --git a/tests/run/i20145.check b/tests/run/i20145.check
@@ -0,0 +1 @@
+10000001
diff --git a/tests/run/i20145.scala b/tests/run/i20145.scala
@@ -0,0 +1,15 @@
+import scala.annotation.tailrec
+@tailrec
+def foo(i: Int): Int = {
+  if (i > 10000000) {
+    i
+  } else {
+    val bar: String = {
+      return foo(i + 1)
+      "foo"
+    }
+    -1
+  }
+}
+@main def Test =
+  println(foo(0))