Backport "Check path of module prefix for tailrec" to 3.7.2

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

@@ -2720,7 +2720,7 @@ object SymDenotations {
       || owner.isRefinementClass
       || owner.is(Scala2x)
       || owner.unforcedDecls.contains(denot.name, denot.symbol)
-      || (denot.is(Synthetic) && denot.is(ModuleClass) && stillValidInOwner(denot.companionClass))
+      || (denot.is(Synthetic) && denot.is(ModuleClass) && denot.companionClass.exists && stillValidInOwner(denot.companionClass))
       || denot.isSelfSym
       || denot.isLocalDummy)
   catch case ex: StaleSymbol => false

compiler/src/dotty/tools/dotc/interactive/Completion.scala

@@ -324,15 +324,15 @@ object Completion:
    *   8. symbol is not a constructor proxy module when in type completion mode
    *   9. have same term/type kind as name prefix given so far
    */
-  def isValidCompletionSymbol(sym: Symbol, completionMode: Mode, isNew: Boolean)(using Context): Boolean =
-
+  def isValidCompletionSymbol(sym: Symbol, completionMode: Mode, isNew: Boolean)(using Context): Boolean = try
     lazy val isEnum = sym.is(Enum) ||
       (sym.companionClass.exists && sym.companionClass.is(Enum))
 
     sym.exists &&
     !sym.isAbsent(canForce = false) &&
     !sym.isPrimaryConstructor &&
-    sym.sourceSymbol.exists &&
+      // running sourceSymbol on ExportedTerm will force a lot of computation from collectSubTrees
+    (sym.is(ExportedTerm) || sym.sourceSymbol.exists) &&
     (!sym.is(Package) || sym.is(ModuleClass)) &&
     !sym.isAllOf(Mutable | Accessor) &&
     !sym.isPackageObject &&
@@ -343,6 +343,9 @@ object Completion:
          (completionMode.is(Mode.Term) && (sym.isTerm || sym.is(ModuleClass))
       || (completionMode.is(Mode.Type) && (sym.isType || sym.isStableMember)))
     )
+  catch
+    case NonFatal(ex) =>
+      false
   end isValidCompletionSymbol
 
   given ScopeOrdering(using Context): Ordering[Seq[SingleDenotation]] with

compiler/src/dotty/tools/dotc/transform/TailRec.scala

@@ -346,7 +346,10 @@ class TailRec extends MiniPhase {
               case prefix: This if prefix.symbol == enclosingClass =>
                 // Avoid assigning `this = this`
                 assignParamPairs
-              case prefix if prefix.symbol.is(Module) && prefix.symbol.moduleClass == enclosingClass =>
+              case prefix
+              if prefix.symbol.is(Module)
+              && prefix.symbol.moduleClass == enclosingClass
+              && isPurePath(prefix) =>
                 // Avoid assigning `this = MyObject`
                 assignParamPairs
               case _ =>

tests/pos-macros/i13821-a/Macro.scala

@@ -0,0 +1,6 @@
+trait Conversions:
+  given conv(using DFBits.Candidate): Conversion[Int, DFVal] = ???
+
+import scala.quoted.*
+transparent inline def f: Short = ${ getWidthMacro }
+private def getWidthMacro(using Quotes): Expr[Short] = '{ ??? }

tests/pos-macros/i13821-a/Test.scala

@@ -0,0 +1,12 @@
+type DFBits = Long
+object DFBits:
+  def a: Unit = f // forces suspension of this compilation unit in typer
+  def b: DFVal = 2 // uses implicit conversion `DFVal.conv`
+
+  trait Candidate
+  object Candidate:
+    given candidate: Candidate = ??? // completed in run 3 but created in run 2
+end DFBits
+
+trait DFVal
+object DFVal extends Conversions

tests/pos-macros/i13821-b/Macro.scala

@@ -0,0 +1,7 @@
+import outer._
+trait Conversions:
+  given conv(using DFBits.Candidate): Conversion[Int, DFVal] = ???
+
+import scala.quoted.*
+transparent inline def f: Short = ${ getWidthMacro }
+private def getWidthMacro(using Quotes): Expr[Short] = '{ ??? }

tests/pos-macros/i13821-b/Test.scala

@@ -0,0 +1,14 @@
+type outer = Int
+object outer:
+  type DFBits = Long
+  object DFBits:
+    def a: Unit = f // forces suspension of this compilation unit in typer
+    def b: DFVal = 2 // uses implicit conversion `DFVal.conv`
+
+    trait Candidate
+    object Candidate:
+      given candidate: Candidate = ??? // completed in run 3 but created in run 2
+  end DFBits
+
+  trait DFVal
+  object DFVal extends Conversions

tests/pos-macros/i19351/A.scala

@@ -0,0 +1,6 @@
+// object A:
+  val x: Int = 1
+  inline def myMacro(): x.type = ${myMacroExpr}
+  def test = myMacro()
+
+@main def main() = ()

tests/neg/i19351/B.scala → tests/pos-macros/i19351/B.scala

@@ -1,3 +1,3 @@
 import scala.quoted.*
-//import A.*
+// import A.*
 def myMacroExpr(using Quotes): Expr[x.type] = '{???}

tests/neg/i19351a/Test.scala → tests/pos-macros/i19351a/Test.scala

@@ -5,7 +5,7 @@ type Bool = [R] => (R, R) => R
 val True: Bool = [R] => (t: R, _: R) => t
 val False: Bool = [R] => (_: R, f: R) => f
 
-inline def not(b: Bool): Bool = ${notMacro('b)} // error
+inline def not(b: Bool): Bool = ${notMacro('b)}
 inline def show(b: Bool): String = ${showMacro('b)}
 //inline def not(b: Bool): Bool = ${foldMacro('b, 'False, 'True)}
 //inline def show(b: Bool): String = ${foldMacro('b, '{"TRUE"}, '{"FALSE"})}

tests/run/i23444.scala

@@ -0,0 +1,22 @@
+
+import annotation.*
+
+class Path(action: () => Unit, parent: Option[Path]):
+  object O:
+    @tailrec
+    def apply(): Unit =
+      action()
+
+      parent match
+        case Some(p) =>
+          p.O.apply()
+        case None =>
+
+@main def Test: Unit =
+  var counter = 0
+  val fun = () => {
+    counter += 1
+    if counter > 2 then throw AssertionError("bad loop")
+  }
+  val path = Path(fun, Some(Path(fun, None)))
+  path.O()