Skip to content

Don't lift try-catch statements that are already in local functions #13944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
odersky merged 2 commits into from
Jan 23, 2022
Merged

Don't lift try-catch statements that are already in local functions #13944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e707bb0
Don't lift try-catch statements that are already in local functions
KacperFKorban Nov 13, 2021
abd4998
Fix scalatest community-build
KacperFKorban Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion community-build/community-projects/scalatest
Open in desktop
Submodule scalatest updated 1 files
+2 −0 jvm/refspec/src/main/scala/org/scalatest/refspec/RefSpecLike.scala
3 changes: 3 additions & 0 deletions compiler/src/dotty/tools/dotc/transform/LiftTry.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions tests/pos/i13941.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}