Align coverage negative test handling

Author: anatoliykmetyuk

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

@@ -191,13 +191,11 @@ object LiftCoverage extends LiftImpure:
   def markSelectedReceiverApply(tree: tpd.Apply)(using Context): Unit =
     tree.putAttachment(SelectedReceiverApply, tree)
 
-  override protected def onLiftedDef(tree: tpd.Tree)(using Context): Unit =
-    tree.putAttachment(CoverageLiftedTemp, liftingArgs)
-
   /** Keep RHS-local symbols unchanged: coverage moves them only under a weak owner. */
   override protected def liftedDef(sym: TermSymbol, rhs: tpd.Tree)(using Context): tpd.MemberDef =
     val rhs1 = ctx.property(PreservedArgType).fold(rhs)(rhs.ensureConforms)
     tpd.ValDef(sym, rhs1, inferred = true)
+      .withAttachment(CoverageLiftedTemp, liftingArgs)
 
   override protected def liftedRef(lifted: TermSymbol, liftedType: Type, expr: tpd.Tree)(using Context): tpd.Tree =
     val liftedRef = tpd.ref(lifted.termRef)

compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala

@@ -55,9 +55,6 @@ abstract class Lifter {
     val tp = expr.tpe.deskolemized
     if tp.isStable then tp else tp.widen
 
-  /** Hook for lifters that need to record or mark freshly created lifted defs. */
-  protected def onLiftedDef(tree: Tree)(using Context): Unit = ()
-
   protected def liftedRef(lifted: TermSymbol, liftedType: Type, expr: Tree)(using Context): Tree =
     ref(lifted.termRef)
 
@@ -73,7 +70,6 @@ abstract class Lifter {
         // at a higher nesting level to prevent leaks. See tests/pos/i15174.scala
         nestingLevel = ctx.nestingLevel + 1)
       val liftedTree = liftedDef(lifted, expr).withSpan(expr.span).setDefTree
-      onLiftedDef(liftedTree)
       defs += liftedTree
       liftedRef(lifted, liftedType, expr).withSpan(expr.span.focus)
     }

compiler/test/dotc/scoverage-ignore.excludelist

@@ -15,28 +15,6 @@ traitParams.scala
 optimizer-warnings.scala
 i10174b.scala
 i17132.min.scala
-sepchecks2.scala
-i15474b.scala
-real-try.scala
-fresh-counter.scala
-capt-depfun2.scala
-lazylists-exceptions.scala
-i16725.scala
-splits-mutable.scala
-i19470.scala
-i11225.scala
-splits.scala
-sep-primer-examples.scala
-type-cast-purity.scala
-mut-iterator4.scala
-caseclass
-capt-depfun.scala
-i15772.scala
-sep-freeze-boxes.scala
-erasedValueb.scala
-lazylists2.scala
-i16114.scala
-check-inferred.scala
 i15158.scala
 recursive-lower-constraint.scala
 i21015.scala

tests/neg-custom-args/captures/freeze-boxes.check

@@ -2,12 +2,11 @@
 21 |  val xs: Box[Ref^{}] = freeze:
 22 |    Box(a)  // error
    |                        ^
-   |                        Found:    Box[Ref^{any.rd}]^{}
-   |                        Required: Box[Ref^{}]^{any².rd}
+   |                        Found:    Box[Ref^{a.rd}]^{}
+   |                        Required: Box[Ref^{}]^{any.rd}
    |
-   |                        Note that capability `any.rd` cannot flow into capture set {}.
+   |                        Note that capability `a.rd` cannot flow into capture set {}.
    |
-   |                        where:    any  is a root capability classified as Unscoped in the type of value x$1
-   |                                  any² is a root capability classified as Unscoped in the type of value xs
+   |                        where:    any is a root capability classified as Unscoped in the type of value xs
    |
    | longer explanation available when compiling with `-explain`