Skip to content

Commit

Permalink
Do not propagate @tailrec to exported methods (scala#19509)
Browse files Browse the repository at this point in the history
  • Loading branch information
bishabosha authored Jan 23, 2024
2 parents 21c2289 + ef4888b commit fff24b1
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 1 deletion.
8 changes: 7 additions & 1 deletion compiler/src/dotty/tools/dotc/typer/Namer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,13 @@ class Namer { typer: Typer =>
newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)

forwarder.info = avoidPrivateLeaks(forwarder)
forwarder.addAnnotations(sym.annotations.filterConserve(_.symbol != defn.BodyAnnot))
forwarder.addAnnotations(sym.annotations.filterConserve { annot =>
annot.symbol != defn.BodyAnnot
&& annot.symbol != defn.TailrecAnnot
&& annot.symbol != defn.MainAnnot
&& !annot.symbol.derivesFrom(defn.MacroAnnotationClass)
&& !annot.symbol.derivesFrom(defn.MainAnnotationClass)
})

if forwarder.isType then
buf += tpd.TypeDef(forwarder.asType).withSpan(span)
Expand Down
5 changes: 5 additions & 0 deletions tests/pos/export-main.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
object Foo:
@main def baz: Int = 1

object Bar:
export Foo.baz // export Foo.baz but not create an new main entry point
10 changes: 10 additions & 0 deletions tests/pos/i19505.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import scala.annotation.tailrec

object Foo:
@tailrec
def foo(n: Int): Int =
if n == 0 then 0
else foo(n-1)

object Bar:
export Foo.foo // def foo here should not have `@tailrec`
13 changes: 13 additions & 0 deletions tests/run-macros/annot-export/Macro_1.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import scala.annotation.{experimental, MacroAnnotation}
import scala.quoted._
import scala.collection.mutable.Map

@experimental
class returnClassName extends MacroAnnotation {
def transform(using Quotes)(tree: quotes.reflect.Definition): List[quotes.reflect.Definition] =
import quotes.reflect._
tree match
case DefDef(name, params, tpt, _) =>
val rhs = Literal(StringConstant(Symbol.spliceOwner.name.stripSuffix("$")))
List(DefDef.copy(tree)(name, params, tpt, Some(rhs)))
}
10 changes: 10 additions & 0 deletions tests/run-macros/annot-export/Test_2.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
object Bar:
@returnClassName
def f(): String = ??? // def f(): String = "Bar"

object Baz:
export Bar.f // def f(): String = Bar.f(n)

@main def Test =
assert(Bar.f() == "Bar")
assert(Baz.f() == "Bar")
8 changes: 8 additions & 0 deletions tests/warn/i19505.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import scala.annotation.tailrec

object Foo:
@tailrec
def foo: Int = foo // warn: Infinite recursive call

object Bar:
export Foo.foo // def foo here should not have `@tailrec`

0 comments on commit fff24b1

Please sign in to comment.