diff --git a/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala b/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
index 491f3d3d2572..449402f17fce 100644
--- a/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
+++ b/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
@@ -145,6 +145,31 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
       val span = pos.span.toSynthetic
       invokeCall(statementId, span)
 
+    private def transformApplyArgs(trees: List[Tree])(using Context): List[Tree] =
+      if allConstArgs(trees) then trees else transform(trees)
+
+    private def transformInnerApply(tree: Tree)(using Context): Tree = tree match
+      case a: Apply if a.fun.symbol == defn.StringContextModule_apply =>
+        a
+      case a: Apply =>
+        cpy.Apply(a)(
+          transformInnerApply(a.fun),
+          transformApplyArgs(a.args)
+        )
+      case a: TypeApply =>
+        cpy.TypeApply(a)(
+          transformInnerApply(a.fun),
+          transformApplyArgs(a.args)
+        )
+      case s: Select =>
+        cpy.Select(s)(transformInnerApply(s.qualifier), s.name)
+      case i: (Ident | This) => i
+      case t: Typed =>
+        cpy.Typed(t)(transformInnerApply(t.expr), t.tpt)
+      case other    => transform(other)
+
+    private def allConstArgs(args: List[Tree]) =
+      args.forall(arg => arg.isInstanceOf[Literal] || arg.isInstanceOf[Ident])
     /**
       * Tries to instrument an `Apply`.
       * These "tryInstrument" methods are useful to tweak the generation of coverage instrumentation,
@@ -158,10 +183,12 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
         // Create a call to Invoker.invoked(coverageDirectory, newStatementId)
         val coverageCall = createInvokeCall(tree, tree.sourcePos)
 
-        if needsLift(tree) then
-          // Transform args and fun, i.e. instrument them if needed (and if possible)
-          val app = cpy.Apply(tree)(transform(tree.fun), tree.args.map(transform))
+        // Transform args and fun, i.e. instrument them if needed (and if possible)
+        val app =
+          if tree.fun.symbol eq defn.throwMethod then tree
+          else cpy.Apply(tree)(transformInnerApply(tree.fun), transformApplyArgs(tree.args))
 
+        if needsLift(tree) then
           // Lifts the arguments. Note that if only one argument needs to be lifted, we lift them all.
           // Also, tree.fun can be lifted too.
           // See LiftCoverage for the internal working of this lifting.
@@ -171,11 +198,10 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
           InstrumentedParts(liftedDefs.toList, coverageCall, liftedApp)
         else
           // Instrument without lifting
-          val transformed = cpy.Apply(tree)(transform(tree.fun), transform(tree.args))
-          InstrumentedParts.singleExpr(coverageCall, transformed)
+          InstrumentedParts.singleExpr(coverageCall, app)
       else
         // Transform recursively but don't instrument the tree itself
-        val transformed = cpy.Apply(tree)(transform(tree.fun), transform(tree.args))
+        val transformed = cpy.Apply(tree)(transformInnerApply(tree.fun), transform(tree.args))
         InstrumentedParts.notCovered(transformed)
 
     private def tryInstrument(tree: Ident)(using Context): InstrumentedParts =
@@ -187,9 +213,14 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
       else
         InstrumentedParts.notCovered(tree)
 
+    private def tryInstrument(tree: Literal)(using Context): InstrumentedParts =
+      val coverageCall = createInvokeCall(tree, tree.sourcePos)
+      InstrumentedParts.singleExpr(coverageCall, tree)
+
     private def tryInstrument(tree: Select)(using Context): InstrumentedParts =
       val sym = tree.symbol
-      val transformed = cpy.Select(tree)(transform(tree.qualifier), tree.name)
+      val qual = transform(tree.qualifier).ensureConforms(tree.qualifier.tpe)
+      val transformed = cpy.Select(tree)(qual, tree.name)
       if canInstrumentParameterless(sym) then
         // call to a parameterless method
         val coverageCall = createInvokeCall(tree, tree.sourcePos)
@@ -202,6 +233,7 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
       tree match
         case t: Apply => tryInstrument(t)
         case t: Ident => tryInstrument(t)
+        case t: Literal => tryInstrument(t)
         case t: Select => tryInstrument(t)
         case _ => InstrumentedParts.notCovered(transform(tree))
 
@@ -223,10 +255,14 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
       inContext(transformCtx(tree)) { // necessary to position inlined code properly
         tree match
           // simple cases
-          case tree: (Import | Export | Literal | This | Super | New) => tree
+          case tree: (Import | Export | This | Super | New) => tree
           case tree if tree.isEmpty || tree.isType => tree // empty Thicket, Ident (referring to a type), TypeTree, ...
           case tree if !tree.span.exists || tree.span.isZeroExtent => tree // no meaningful position
 
+          case tree: Literal =>
+            val rest = tryInstrument(tree).toTree
+            rest
+
           // identifier
           case tree: Ident =>
             tryInstrument(tree).toTree
@@ -280,6 +316,9 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
           case tree: CaseDef =>
             transformCaseDef(tree)
 
+          case tree: ValDef if tree.symbol.is(Inline) =>
+            tree // transforming inline vals will result in `inline value must be pure` errors
+
           case tree: ValDef =>
             // only transform the rhs
             val rhs = transform(tree.rhs)
@@ -323,13 +362,13 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
             )
 
           case tree: Inlined =>
-            // Ideally, tree.call would provide precise information about the inlined call,
-            // and we would use this information for the coverage report.
-            // But PostTyper simplifies tree.call, so we can't report the actual method that was inlined.
-            // In any case, the subtrees need to be repositioned right now, otherwise the
-            // coverage statement will point to a potentially unreachable source file.
-            val dropped = Inlines.dropInlined(tree) // drop and reposition
-            transform(dropped) // transform the content of the Inlined
+            // Inlined code contents might come from another file (or project),
+            // which means that we cannot clearly designate which part of the inlined code
+            // was run using the API we are given.
+            // At best, we can show that the Inlined tree itself was reached.
+            // Additionally, Scala 2's coverage ignores macro calls entirely,
+            // so let's do that here too, also for regular inlined calls.
+            tree
 
           // For everything else just recurse and transform
           case _ =>
@@ -559,15 +598,14 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
     private def isCompilerIntrinsicMethod(sym: Symbol)(using Context): Boolean =
       val owner = sym.maybeOwner
       owner.exists && (
-        owner.eq(defn.AnyClass) ||
-        owner.isPrimitiveValueClass ||
+        (owner.eq(defn.AnyClass) && (sym == defn.Any_asInstanceOf || sym == defn.Any_isInstanceOf)) ||
         owner.maybeOwner == defn.CompiletimePackageClass
       )
 
 object InstrumentCoverage:
   val name: String = "instrumentCoverage"
   val description: String = "instrument code for coverage checking"
-  val ExcludeMethodFlags: FlagSet = Synthetic | Artifact | Erased
+  val ExcludeMethodFlags: FlagSet = Artifact | Erased
 
   /**
    * An instrumented Tree, in 3 parts.
diff --git a/tests/coverage/pos/Constructor.scoverage.check b/tests/coverage/pos/Constructor.scoverage.check
index a95bb21488b8..ed9ac68752bb 100644
--- a/tests/coverage/pos/Constructor.scoverage.check
+++ b/tests/coverage/pos/Constructor.scoverage.check
@@ -110,6 +110,23 @@ C
 Class
 covtest.C
 x
+161
+162
+13
+<none>
+Literal
+false
+0
+false
+1
+
+6
+Constructor.scala
+covtest
+C
+Class
+covtest.C
+x
 153
 158
 13
@@ -120,7 +137,7 @@ false
 false
 def x
 
-6
+7
 Constructor.scala
 covtest
 C
@@ -137,7 +154,7 @@ false
 false
 f(x)
 
-7
+8
 Constructor.scala
 covtest
 C
@@ -154,7 +171,24 @@ false
 false
 x
 
-8
+9
+Constructor.scala
+covtest
+C
+Class
+covtest.C
+g
+188
+189
+16
+<none>
+Literal
+false
+0
+false
+2
+
+10
 Constructor.scala
 covtest
 C
@@ -171,7 +205,7 @@ false
 false
 def g
 
-9
+11
 Constructor.scala
 covtest
 O
@@ -188,7 +222,24 @@ false
 false
 def g
 
-10
+12
+Constructor.scala
+covtest
+O
+Object
+covtest.O
+y
+231
+232
+20
+<none>
+Literal
+false
+0
+false
+1
+
+13
 Constructor.scala
 covtest
 O
@@ -205,7 +256,7 @@ false
 false
 def y
 
-11
+14
 Constructor.scala
 covtest
 O
@@ -222,20 +273,3 @@ false
 false
 g(y)
 
-12
-Constructor.scala
-covtest
-O
-Object
-covtest.O
-<init>
-237
-238
-21
-y
-Ident
-false
-0
-false
-y
-
diff --git a/tests/coverage/pos/ContextFunctions.scoverage.check b/tests/coverage/pos/ContextFunctions.scoverage.check
index 0d616d811ffe..ee5c40b9b1ac 100644
--- a/tests/coverage/pos/ContextFunctions.scoverage.check
+++ b/tests/coverage/pos/ContextFunctions.scoverage.check
@@ -41,6 +41,23 @@ covtest
 Imperative
 Class
 covtest.Imperative
+$anonfun
+178
+184
+9
+<none>
+Literal
+false
+0
+false
+"name"
+
+2
+ContextFunctions.scala
+covtest
+Imperative
+Class
+covtest.Imperative
 readName2
 121
 134
@@ -52,24 +69,24 @@ false
 false
 def readName2
 
-2
+3
 ContextFunctions.scala
 covtest
 Imperative
 Class
 covtest.Imperative
 readPerson
-252
-309
-14
-onError
-Apply
+243
+247
+13
+<none>
+Literal
 false
 0
 false
-OnError((e) => readName2(using e)(using s)).onError(None)
+null
 
-3
+4
 ContextFunctions.scala
 covtest
 Imperative
@@ -77,16 +94,16 @@ Class
 covtest.Imperative
 readPerson
 252
-295
+309
 14
-<init>
+onError
 Apply
 false
 0
 false
-OnError((e) => readName2(using e)(using s))
+OnError((e) => readName2(using e)(using s)).onError(None)
 
-4
+5
 ContextFunctions.scala
 covtest
 Imperative
@@ -103,7 +120,7 @@ false
 false
 readName2(using e)(using s)
 
-5
+6
 ContextFunctions.scala
 covtest
 Imperative
diff --git a/tests/coverage/pos/Enum.scoverage.check b/tests/coverage/pos/Enum.scoverage.check
index 6806934e0dec..4ad02971f6cf 100644
--- a/tests/coverage/pos/Enum.scoverage.check
+++ b/tests/coverage/pos/Enum.scoverage.check
@@ -24,6 +24,57 @@ covtest
 Planet
 Class
 covtest.Planet
+<init>
+322
+333
+14
+<none>
+Literal
+false
+0
+false
+6.67300E-11
+
+1
+Enum.scala
+covtest
+Planet
+Class
+covtest.Planet
+surfaceGravity
+359
+386
+15
+/
+Apply
+false
+0
+false
+G * mass / (radius * radius
+
+2
+Enum.scala
+covtest
+Planet
+Class
+covtest.Planet
+surfaceGravity
+371
+386
+15
+*
+Apply
+false
+0
+false
+radius * radius
+
+3
+Enum.scala
+covtest
+Planet
+Class
+covtest.Planet
 surfaceGravity
 338
 356
@@ -35,7 +86,24 @@ false
 false
 def surfaceGravity
 
-1
+4
+Enum.scala
+covtest
+Planet
+Class
+covtest.Planet
+surfaceWeight
+432
+458
+16
+*
+Apply
+false
+0
+false
+otherMass * surfaceGravity
+
+5
 Enum.scala
 covtest
 Planet
@@ -52,7 +120,7 @@ false
 false
 surfaceGravity
 
-2
+6
 Enum.scala
 covtest
 Planet
@@ -69,7 +137,381 @@ false
 false
 def surfaceWeight
 
+7
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+492
+501
+18
+<none>
+Literal
+false
+0
+false
+3.303e+23
+
+8
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+503
+511
+18
+<none>
+Literal
+false
+0
+false
+2.4397e6
+
+9
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+545
+554
+19
+<none>
+Literal
+false
+0
+false
+4.869e+24
+
+10
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+556
+564
+19
+<none>
+Literal
+false
+0
+false
+6.0518e6
+
+11
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+598
+607
+20
+<none>
+Literal
+false
+0
+false
+5.976e+24
+
+12
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+609
+618
+20
+<none>
+Literal
+false
+0
+false
+6.37814e6
+
+13
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+652
+661
+21
+<none>
+Literal
+false
+0
+false
+6.421e+23
+
+14
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+663
+671
+21
+<none>
+Literal
+false
+0
+false
+3.3972e6
+
+15
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+705
+712
+22
+<none>
+Literal
+false
+0
+false
+1.9e+27
+
+16
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+716
+724
+22
+<none>
+Literal
+false
+0
+false
+7.1492e7
+
+17
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+758
+767
+23
+<none>
+Literal
+false
+0
+false
+5.688e+26
+
+18
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+769
+777
+23
+<none>
+Literal
+false
+0
+false
+6.0268e7
+
+19
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+811
+820
+24
+<none>
+Literal
+false
+0
+false
+8.686e+25
+
+20
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+822
+830
+24
+<none>
+Literal
+false
+0
+false
+2.5559e7
+
+21
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+864
+873
+25
+<none>
+Literal
+false
+0
+false
+1.024e+26
+
+22
+Enum.scala
+covtest
+$anon
+Class
+covtest.$anon
+<init>
+875
+883
+25
+<none>
+Literal
+false
+0
+false
+2.4746e7
+
+23
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+970
+1038
+30
+apply
+Apply
+false
+0
+false
+ListEnum.Cons(1, ListEnum.Cons(2, ListEnum.Cons(3, ListEnum.Empty)))
+
+24
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+984
+985
+30
+<none>
+Literal
+false
+0
+false
+1
+
+25
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+987
+1037
+30
+apply
+Apply
+false
+0
+false
+ListEnum.Cons(2, ListEnum.Cons(3, ListEnum.Empty))
+
+26
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+1001
+1002
+30
+<none>
+Literal
+false
+0
+false
+2
+
+27
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+1004
+1036
+30
+apply
+Apply
+false
+0
+false
+ListEnum.Cons(3, ListEnum.Empty)
+
+28
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+1018
+1019
+30
+<none>
+Literal
+false
+0
+false
 3
+
+29
 Enum.scala
 covtest
 EnumTypes
@@ -86,7 +528,7 @@ false
 false
 println("Example 1: \\n"+emptyList)
 
-4
+30
 Enum.scala
 covtest
 EnumTypes
@@ -103,7 +545,24 @@ false
 false
 "Example 1: \\n"+emptyList
 
-5
+31
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+test
+1051
+1066
+31
+<none>
+Literal
+false
+0
+false
+"Example 1: \\n"
+
+32
 Enum.scala
 covtest
 EnumTypes
@@ -120,7 +579,7 @@ false
 false
 println(s"${list}\\n")
 
-6
+33
 Enum.scala
 covtest
 EnumTypes
@@ -137,7 +596,24 @@ false
 false
 s"${list}\\n"
 
-7
+34
+Enum.scala
+covtest
+EnumTypes
+Object
+covtest.EnumTypes
+calculateEarthWeightOnPlanets
+1183
+1222
+35
+/
+Apply
+false
+0
+false
+earthWeight/Planet.Earth.surfaceGravity
+
+35
 Enum.scala
 covtest
 EnumTypes
@@ -154,7 +630,7 @@ false
 false
 Planet.Earth.surfaceGravity
 
-8
+36
 Enum.scala
 covtest
 EnumTypes
@@ -171,7 +647,7 @@ false
 false
 for p <- Planet.values do\n        println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
 
-9
+37
 Enum.scala
 covtest
 EnumTypes
@@ -181,14 +657,14 @@ calculateEarthWeightOnPlanets
 1238
 1251
 36
-refArrayOps
-Apply
+values
+Select
 false
 0
 false
 Planet.values
 
-10
+38
 Enum.scala
 covtest
 EnumTypes
@@ -205,7 +681,7 @@ false
 false
 println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
 
-11
+39
 Enum.scala
 covtest
 EnumTypes
@@ -222,7 +698,7 @@ false
 false
 s"Your weight on $p is ${p.surfaceWeight(mass)}"
 
-12
+40
 Enum.scala
 covtest
 EnumTypes
@@ -239,7 +715,7 @@ false
 false
 p.surfaceWeight(mass)
 
-13
+41
 Enum.scala
 covtest
 EnumTypes
@@ -256,7 +732,7 @@ false
 false
 def calculateEarthWeightOnPlanets
 
-14
+42
 Enum.scala
 covtest
 EnumTypes
@@ -273,7 +749,7 @@ false
 false
 println("Example 2:")
 
-15
+43
 Enum.scala
 covtest
 EnumTypes
@@ -290,7 +766,7 @@ false
 false
 calculateEarthWeightOnPlanets(80)
 
-16
+44
 Enum.scala
 covtest
 EnumTypes
diff --git a/tests/coverage/pos/ExcludeClass.scoverage.check b/tests/coverage/pos/ExcludeClass.scoverage.check
index 5e77f0ce21a1..370410b68091 100644
--- a/tests/coverage/pos/ExcludeClass.scoverage.check
+++ b/tests/coverage/pos/ExcludeClass.scoverage.check
@@ -25,6 +25,23 @@ Klass2
 Class
 covtest.Klass2
 abs
+202
+207
+15
+>
+Apply
+false
+0
+false
+i > 0
+
+1
+ExcludeClass.scala
+covtest
+Klass2
+Class
+covtest.Klass2
+abs
 219
 220
 16
@@ -35,7 +52,24 @@ true
 false
 i
 
-1
+2
+ExcludeClass.scala
+covtest
+Klass2
+Class
+covtest.Klass2
+abs
+236
+238
+18
+unary_-
+Select
+false
+0
+false
+-i
+
+3
 ExcludeClass.scala
 covtest
 Klass2
@@ -52,7 +86,7 @@ true
 false
 -i
 
-2
+4
 ExcludeClass.scala
 covtest
 Klass2
diff --git a/tests/coverage/pos/For.scoverage.check b/tests/coverage/pos/For.scoverage.check
index 6eeab746b4c5..9942da22d02e 100644
--- a/tests/coverage/pos/For.scoverage.check
+++ b/tests/coverage/pos/For.scoverage.check
@@ -41,40 +41,6 @@ covtest
 For$package
 Object
 covtest.For$package
-testForLoop
-52
-59
-4
-to
-Apply
-false
-0
-false
-1 to 10
-
-2
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
-testForLoop
-52
-53
-4
-intWrapper
-Apply
-false
-0
-false
-1
-
-3
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
 $anonfun
 67
 77
@@ -86,7 +52,7 @@ false
 false
 println(i)
 
-4
+2
 For.scala
 covtest
 For$package
@@ -103,92 +69,58 @@ false
 false
 def testForLoop
 
-5
+3
 For.scala
 covtest
 For$package
 Object
 covtest.For$package
 f
-109
-114
+134
+138
 8
-f
-DefDef
-false
-0
-false
-def f
-
-6
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
-testForAdvanced
-141
-183
-9
-foreach
-Apply
+<none>
+Literal
 false
 0
 false
-for j <- 1 to 10 if f(j) do\n    println(j)
+true
 
-7
+4
 For.scala
 covtest
 For$package
 Object
 covtest.For$package
-testForAdvanced
-145
-165
-9
-withFilter
-Apply
-false
-0
-false
-j <- 1 to 10 if f(j)
-
+f
+109
+114
 8
-For.scala
-covtest
-For$package
-Object
-covtest.For$package
-testForAdvanced
-150
-157
-9
-to
-Apply
+f
+DefDef
 false
 0
 false
-1 to 10
+def f
 
-9
+5
 For.scala
 covtest
 For$package
 Object
 covtest.For$package
 testForAdvanced
-150
-151
+141
+183
 9
-intWrapper
+foreach
 Apply
 false
 0
 false
-1
+for j <- 1 to 10 if f(j) do\n    println(j)
 
-10
+6
 For.scala
 covtest
 For$package
@@ -205,7 +137,7 @@ false
 false
 f(j)
 
-11
+7
 For.scala
 covtest
 For$package
@@ -222,7 +154,7 @@ false
 false
 println(j)
 
-12
+8
 For.scala
 covtest
 For$package
@@ -239,7 +171,7 @@ false
 false
 def testForAdvanced
 
-13
+9
 For.scala
 covtest
 For$package
@@ -256,7 +188,7 @@ false
 false
 Nil.foreach(_ => println("user code here"))
 
-14
+10
 For.scala
 covtest
 For$package
@@ -273,7 +205,7 @@ false
 false
 println("user code here")
 
-15
+11
 For.scala
 covtest
 For$package
diff --git a/tests/coverage/pos/Givens.scoverage.check b/tests/coverage/pos/Givens.scoverage.check
index 4442f329c6b2..b09e369ee076 100644
--- a/tests/coverage/pos/Givens.scoverage.check
+++ b/tests/coverage/pos/Givens.scoverage.check
@@ -42,6 +42,40 @@ Givens
 Class
 covtest.Givens
 test
+182
+190
+11
+==
+Apply
+false
+0
+false
+3 == "3"
+
+2
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+test
+182
+183
+11
+<none>
+Literal
+false
+0
+false
+3
+
+3
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+test
 196
 213
 12
@@ -52,7 +86,41 @@ false
 false
 println(3 == 5.1)
 
-2
+4
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+test
+204
+212
+12
+==
+Apply
+false
+0
+false
+3 == 5.1
+
+5
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+test
+204
+205
+12
+<none>
+Literal
+false
+0
+false
+3
+
+6
 Givens.scala
 covtest
 Givens
@@ -69,7 +137,7 @@ false
 false
 def test
 
-3
+7
 Givens.scala
 covtest
 Givens
@@ -86,7 +154,7 @@ false
 false
 println(msg)
 
-4
+8
 Givens.scala
 covtest
 Givens
@@ -103,7 +171,7 @@ false
 false
 println(ctx.id)
 
-5
+9
 Givens.scala
 covtest
 Givens
@@ -120,7 +188,24 @@ false
 false
 def printContext
 
-6
+10
+Givens.scala
+covtest
+Givens
+Class
+covtest.Givens
+getMessage
+348
+358
+18
+toString
+Apply
+false
+0
+false
+i.toString
+
+11
 Givens.scala
 covtest
 Givens
@@ -137,7 +222,7 @@ false
 false
 def getMessage
 
-7
+12
 Givens.scala
 covtest
 Givens
@@ -154,7 +239,7 @@ false
 false
 Context(0)
 
-8
+13
 Givens.scala
 covtest
 Givens
@@ -171,7 +256,7 @@ false
 false
 printContext("test")(using c)
 
-9
+14
 Givens.scala
 covtest
 Givens
@@ -188,7 +273,7 @@ false
 false
 printContext(getMessage(123))
 
-10
+15
 Givens.scala
 covtest
 Givens
@@ -205,7 +290,7 @@ false
 false
 getMessage(123)
 
-11
+16
 Givens.scala
 covtest
 Givens
diff --git a/tests/coverage/pos/Inlined.scala b/tests/coverage/pos/Inlined.scala
index 5e51f037220f..37519e9f63e3 100644
--- a/tests/coverage/pos/Inlined.scala
+++ b/tests/coverage/pos/Inlined.scala
@@ -1,6 +1,7 @@
 package covtest
 
 // Checks that we use the new positions of the inlined code properly
+// NOTE (12.08.2025): After recent changes, the inlined nodes will not be tagged in coverage
 def testInlined(): Unit =
   val l = 1
   assert(l == 1)
diff --git a/tests/coverage/pos/Inlined.scoverage.check b/tests/coverage/pos/Inlined.scoverage.check
index c74868219b67..cf8d1bcdb0f7 100644
--- a/tests/coverage/pos/Inlined.scoverage.check
+++ b/tests/coverage/pos/Inlined.scoverage.check
@@ -25,230 +25,26 @@ Inlined$package
 Object
 covtest.Inlined$package
 testInlined
-288
-330
-11
-assertFailed
-Apply
-false
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-1
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-true
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-2
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-330
-330
-11
-<none>
-Literal
-true
-0
-false
-
-
-3
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-155
-162
-7
-apply
-Apply
-false
-0
-false
-List(l)
-
-4
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-155
-169
-7
-length
-Select
-false
-0
-false
-List(l).length
-
-5
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-false
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
+215
+216
 6
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-true
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-7
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-330
-330
-11
 <none>
 Literal
-true
-0
-false
-
-
-8
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-180
-187
-8
-apply
-Apply
 false
 0
 false
-List(l)
+1
 
-9
+1
 Inlined.scala
 covtest
 Inlined$package
 Object
 covtest.Inlined$package
 testInlined
-180
+179
 194
-8
-length
-Select
-false
-0
-false
-List(l).length
-
-10
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-false
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-11
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-288
-330
-11
-assertFailed
-Apply
-true
-0
-false
-scala.runtime.Scala3RunTime.assertFailed()
-
-12
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-330
-330
-11
-<none>
-Literal
-true
-0
-false
-
-
-13
-Inlined.scala
-covtest
-Inlined$package
-Object
-covtest.Inlined$package
-testInlined
-86
-101
-4
+5
 testInlined
 DefDef
 false
diff --git a/tests/coverage/pos/InlinedFromLib.scala b/tests/coverage/pos/InlinedFromLib.scala
index 1b05e11b7558..7607ded865d7 100644
--- a/tests/coverage/pos/InlinedFromLib.scala
+++ b/tests/coverage/pos/InlinedFromLib.scala
@@ -2,6 +2,7 @@ package covtest
 
 // assert is a `transparent inline` in Predef,
 // but its source path should not appear in the coverage report.
+// NOTE (12.08.2025): After recent changes, the inlined nodes will not be tagged in coverage
 def testInlined(): Unit =
   val l = 1
   assert(l == 1)
diff --git a/tests/coverage/pos/InlinedFromLib.scoverage.check b/tests/coverage/pos/InlinedFromLib.scoverage.check
index 5aff5473f6d9..bd7bd1a65b6f 100644
--- a/tests/coverage/pos/InlinedFromLib.scoverage.check
+++ b/tests/coverage/pos/InlinedFromLib.scoverage.check
@@ -25,230 +25,26 @@ InlinedFromLib$package
 Object
 covtest.InlinedFromLib$package
 testInlined
-169
-183
+258
+259
 7
-assertFailed
-Apply
-false
-0
-false
-assert(l == 1)
-
-1
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-169
-183
-7
-assertFailed
-Apply
-true
-0
-false
-assert(l == 1)
-
-2
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-169
-183
-7
-<none>
-Literal
-true
-0
-false
-assert(l == 1)
-
-3
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-198
-205
-8
-apply
-Apply
-false
-0
-false
-List(l)
-
-4
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-198
-212
-8
-length
-Select
-false
-0
-false
-List(l).length
-
-5
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-186
-213
-8
-assertFailed
-Apply
-false
-0
-false
-assert(l == List(l).length)
-
-6
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-186
-213
-8
-assertFailed
-Apply
-true
-0
-false
-assert(l == List(l).length)
-
-7
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-186
-213
-8
 <none>
 Literal
-true
-0
-false
-assert(l == List(l).length)
-
-8
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-223
-230
-9
-apply
-Apply
 false
 0
 false
-List(l)
+1
 
-9
+1
 InlinedFromLib.scala
 covtest
 InlinedFromLib$package
 Object
 covtest.InlinedFromLib$package
 testInlined
-223
+222
 237
-9
-length
-Select
-false
-0
-false
-List(l).length
-
-10
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-216
-243
-9
-assertFailed
-Apply
-false
-0
-false
-assert(List(l).length == 1)
-
-11
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-216
-243
-9
-assertFailed
-Apply
-true
-0
-false
-assert(List(l).length == 1)
-
-12
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-216
-243
-9
-<none>
-Literal
-true
-0
-false
-assert(List(l).length == 1)
-
-13
-InlinedFromLib.scala
-covtest
-InlinedFromLib$package
-Object
-covtest.InlinedFromLib$package
-testInlined
-129
-144
-5
+6
 testInlined
 DefDef
 false
diff --git a/tests/coverage/pos/Lift.scoverage.check b/tests/coverage/pos/Lift.scoverage.check
index cce8c18c6254..516692cd2503 100644
--- a/tests/coverage/pos/Lift.scoverage.check
+++ b/tests/coverage/pos/Lift.scoverage.check
@@ -25,6 +25,23 @@ SomeFunctions
 Class
 covtest.SomeFunctions
 f
+56
+58
+4
+<none>
+Literal
+false
+0
+false
+()
+
+1
+Lift.scala
+covtest
+SomeFunctions
+Class
+covtest.SomeFunctions
+f
 40
 45
 4
@@ -35,7 +52,24 @@ false
 false
 def f
 
-1
+2
+Lift.scala
+covtest
+SomeFunctions
+Class
+covtest.SomeFunctions
+g
+71
+72
+5
+<none>
+Literal
+false
+0
+false
+0
+
+3
 Lift.scala
 covtest
 SomeFunctions
@@ -52,7 +86,7 @@ false
 false
 def g
 
-2
+4
 Lift.scala
 covtest
 SomeFunctions
@@ -69,7 +103,7 @@ false
 false
 SomeFunctions()
 
-3
+5
 Lift.scala
 covtest
 SomeFunctions
@@ -86,7 +120,7 @@ false
 false
 def c
 
-4
+6
 Lift.scala
 covtest
 SomeFunctions
@@ -103,24 +137,7 @@ false
 false
 c.f(g())
 
-5
-Lift.scala
-covtest
-SomeFunctions
-Class
-covtest.SomeFunctions
-test
-113
-114
-8
-c
-Select
-false
-0
-false
-c
-
-6
+7
 Lift.scala
 covtest
 SomeFunctions
@@ -137,7 +154,7 @@ false
 false
 g()
 
-7
+8
 Lift.scala
 covtest
 SomeFunctions
diff --git a/tests/coverage/pos/Literals.scoverage.check b/tests/coverage/pos/Literals.scoverage.check
index cd58a841d5b6..c6ea348844ca 100644
--- a/tests/coverage/pos/Literals.scoverage.check
+++ b/tests/coverage/pos/Literals.scoverage.check
@@ -42,6 +42,57 @@ Literals$package
 Object
 covtest.Literals$package
 block
+119
+121
+5
+<none>
+Literal
+false
+0
+false
+12
+
+2
+Literals.scala
+covtest
+Literals$package
+Object
+covtest.Literals$package
+block
+124
+128
+6
+<none>
+Literal
+false
+0
+false
+true
+
+3
+Literals.scala
+covtest
+Literals$package
+Object
+covtest.Literals$package
+block
+131
+135
+7
+<none>
+Literal
+false
+0
+false
+null
+
+4
+Literals.scala
+covtest
+Literals$package
+Object
+covtest.Literals$package
+block
 17
 26
 3
@@ -52,7 +103,7 @@ false
 false
 def block
 
-2
+5
 Literals.scala
 covtest
 Literals$package
@@ -69,7 +120,7 @@ false
 false
 ???
 
-3
+6
 Literals.scala
 covtest
 Literals$package
@@ -86,7 +137,7 @@ false
 false
 def f
 
-4
+7
 Literals.scala
 covtest
 Literals$package
@@ -103,7 +154,7 @@ false
 false
 f(0,1,2)(3)
 
-5
+8
 Literals.scala
 covtest
 Literals$package
diff --git a/tests/coverage/pos/MatchNumbers.scoverage.check b/tests/coverage/pos/MatchNumbers.scoverage.check
index 43e01018f0ac..74dd5db8fc87 100644
--- a/tests/coverage/pos/MatchNumbers.scoverage.check
+++ b/tests/coverage/pos/MatchNumbers.scoverage.check
@@ -25,6 +25,40 @@ MatchNumbers
 Object
 covtest.MatchNumbers
 f
+121
+126
+7
+<
+Apply
+false
+0
+false
+x < 0
+
+1
+MatchNumbers.scala
+covtest
+MatchNumbers
+Object
+covtest.MatchNumbers
+f
+130
+132
+7
+<none>
+Literal
+false
+0
+false
+-1
+
+2
+MatchNumbers.scala
+covtest
+MatchNumbers
+Object
+covtest.MatchNumbers
+f
 127
 132
 7
@@ -35,7 +69,7 @@ true
 false
 => -1
 
-1
+3
 MatchNumbers.scala
 covtest
 MatchNumbers
@@ -52,7 +86,24 @@ true
 false
 => x
 
-2
+4
+MatchNumbers.scala
+covtest
+MatchNumbers
+Object
+covtest.MatchNumbers
+f
+174
+181
+9
+toInt
+Select
+false
+0
+false
+y.toInt
+
+5
 MatchNumbers.scala
 covtest
 MatchNumbers
@@ -69,7 +120,7 @@ true
 false
 => y.toInt
 
-3
+6
 MatchNumbers.scala
 covtest
 MatchNumbers
@@ -86,7 +137,7 @@ false
 false
 def f
 
-4
+7
 MatchNumbers.scala
 covtest
 MatchNumbers
@@ -103,7 +154,7 @@ false
 false
 f(0)
 
-5
+8
 MatchNumbers.scala
 covtest
 MatchNumbers
diff --git a/tests/coverage/pos/PolymorphicExtensions.scoverage.check b/tests/coverage/pos/PolymorphicExtensions.scoverage.check
index 64795070b34f..6eebb8cc94fa 100644
--- a/tests/coverage/pos/PolymorphicExtensions.scoverage.check
+++ b/tests/coverage/pos/PolymorphicExtensions.scoverage.check
@@ -110,15 +110,15 @@ PolyExt
 Object
 covtest.PolyExt
 <init>
-177
-186
-11
-foo
+277
+287
+12
+get
 Apply
 false
 0
 false
-"str".foo
+123.get(0)
 
 6
 PolymorphicExtensions.scala
@@ -126,16 +126,16 @@ covtest
 PolyExt
 Object
 covtest.PolyExt
-<init>
-277
-287
-12
-get
-Apply
+foo
+385
+387
+14
+<none>
+Literal
 false
 0
 false
-123.get(0)
+42
 
 7
 PolymorphicExtensions.scala
@@ -177,40 +177,6 @@ covtest
 PolyExt
 Object
 covtest.PolyExt
-bar
-405
-412
-15
-tap
-Apply
-false
-0
-false
-foo.tap
-
-10
-PolymorphicExtensions.scala
-covtest
-PolyExt
-Object
-covtest.PolyExt
-bar
-405
-408
-15
-foo
-Ident
-false
-0
-false
-foo
-
-11
-PolymorphicExtensions.scala
-covtest
-PolyExt
-Object
-covtest.PolyExt
 $anonfun
 413
 420
@@ -222,7 +188,7 @@ false
 false
 println
 
-12
+10
 PolymorphicExtensions.scala
 covtest
 PolyExt
diff --git a/tests/coverage/pos/PolymorphicMethods.scoverage.check b/tests/coverage/pos/PolymorphicMethods.scoverage.check
index b66aaeb92661..01cc80f6a4dc 100644
--- a/tests/coverage/pos/PolymorphicMethods.scoverage.check
+++ b/tests/coverage/pos/PolymorphicMethods.scoverage.check
@@ -72,19 +72,19 @@ C[String]().f("str", 0)
 3
 PolymorphicMethods.scala
 covtest
-PolyMeth
-Object
-covtest.PolyMeth
-<init>
-147
-158
-7
-<init>
-Apply
+C
+Class
+covtest.C
+f
+221
+223
+10
+<none>
+Literal
 false
 0
 false
-C[String]()
+()
 
 4
 PolymorphicMethods.scala
diff --git a/tests/coverage/pos/Select.scoverage.check b/tests/coverage/pos/Select.scoverage.check
index cfe719552e44..a4830c1a6d5c 100644
--- a/tests/coverage/pos/Select.scoverage.check
+++ b/tests/coverage/pos/Select.scoverage.check
@@ -195,23 +195,6 @@ Select$package
 Object
 covtest.Select$package
 test
-263
-273
-19
-instance
-Select
-false
-0
-false
-a.instance
-
-11
-Select.scala
-covtest
-Select$package
-Object
-covtest.Select$package
-test
 345
 354
 20
@@ -222,7 +205,7 @@ false
 false
 a.print()
 
-12
+11
 Select.scala
 covtest
 Select$package
diff --git a/tests/coverage/pos/SimpleMethods.scoverage.check b/tests/coverage/pos/SimpleMethods.scoverage.check
index 067bd744177b..03d3c1a440ec 100644
--- a/tests/coverage/pos/SimpleMethods.scoverage.check
+++ b/tests/coverage/pos/SimpleMethods.scoverage.check
@@ -42,6 +42,23 @@ C
 Class
 covtest.C
 b
+60
+66
+5
+<none>
+Literal
+false
+0
+false
+return
+
+2
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+b
 46
 51
 5
@@ -52,7 +69,24 @@ false
 false
 def b
 
-2
+3
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+c
+83
+85
+6
+<none>
+Literal
+false
+0
+false
+()
+
+4
 SimpleMethods.scala
 covtest
 C
@@ -69,7 +103,24 @@ false
 false
 def c
 
-3
+5
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+d
+101
+103
+7
+<none>
+Literal
+false
+0
+false
+12
+
+6
 SimpleMethods.scala
 covtest
 C
@@ -86,7 +137,24 @@ false
 false
 def d
 
-4
+7
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+e
+120
+124
+8
+<none>
+Literal
+false
+0
+false
+null
+
+8
 SimpleMethods.scala
 covtest
 C
@@ -103,7 +171,41 @@ false
 false
 def e
 
-5
+9
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+block
+149
+158
+11
+<none>
+Literal
+false
+0
+false
+"literal"
+
+10
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+block
+163
+164
+12
+<none>
+Literal
+false
+0
+false
+0
+
+11
 SimpleMethods.scala
 covtest
 C
@@ -120,7 +222,41 @@ false
 false
 def block
 
-6
+12
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+cond
+195
+200
+15
+<none>
+Literal
+false
+0
+false
+false
+
+13
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+cond
+206
+210
+15
+<none>
+Literal
+false
+0
+false
+true
+
+14
 SimpleMethods.scala
 covtest
 C
@@ -137,7 +273,24 @@ true
 false
 true
 
-7
+15
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+cond
+220
+225
+16
+<none>
+Literal
+false
+0
+false
+false
+
+16
 SimpleMethods.scala
 covtest
 C
@@ -154,7 +307,7 @@ true
 false
 false
 
-8
+17
 SimpleMethods.scala
 covtest
 C
@@ -171,7 +324,41 @@ false
 false
 def cond
 
-9
+18
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+partialCond
+260
+265
+19
+<none>
+Literal
+false
+0
+false
+false
+
+19
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+partialCond
+271
+273
+19
+<none>
+Literal
+false
+0
+false
+()
+
+20
 SimpleMethods.scala
 covtest
 C
@@ -188,7 +375,7 @@ true
 false
 ()
 
-10
+21
 SimpleMethods.scala
 covtest
 C
@@ -205,7 +392,7 @@ true
 false
 
 
-11
+22
 SimpleMethods.scala
 covtest
 C
@@ -222,7 +409,7 @@ false
 false
 def partialCond
 
-12
+23
 SimpleMethods.scala
 covtest
 C
@@ -239,7 +426,24 @@ false
 false
 def new1
 
-13
+24
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+tryCatch
+330
+332
+24
+<none>
+Literal
+false
+0
+false
+()
+
+25
 SimpleMethods.scala
 covtest
 C
@@ -256,7 +460,24 @@ true
 false
 ()
 
-14
+26
+SimpleMethods.scala
+covtest
+C
+Class
+covtest.C
+tryCatch
+370
+371
+26
+<none>
+Literal
+false
+0
+false
+1
+
+27
 SimpleMethods.scala
 covtest
 C
@@ -273,7 +494,7 @@ true
 false
 => 1
 
-15
+28
 SimpleMethods.scala
 covtest
 C
diff --git a/tests/coverage/pos/StructuralTypes.scoverage.check b/tests/coverage/pos/StructuralTypes.scoverage.check
index a487ac29c9de..2f0390044f04 100644
--- a/tests/coverage/pos/StructuralTypes.scoverage.check
+++ b/tests/coverage/pos/StructuralTypes.scoverage.check
@@ -41,6 +41,23 @@ covtest
 Record
 Class
 covtest.Record
+$anonfun
+159
+171
+6
+==
+Apply
+false
+0
+false
+_._1 == name
+
+2
+StructuralTypes.scala
+covtest
+Record
+Class
+covtest.Record
 selectDynamic
 148
 176
@@ -52,7 +69,7 @@ false
 false
 elems.find(_._1 == name).get
 
-2
+3
 StructuralTypes.scala
 covtest
 Record
@@ -69,7 +86,24 @@ false
 false
 def selectDynamic
 
-3
+4
+StructuralTypes.scala
+covtest
+StructuralTypes
+Object
+covtest.StructuralTypes
+test
+270
+307
+13
+apply
+Apply
+false
+0
+false
+Record("name" -> "Emma", "age" -> 42)
+
+5
 StructuralTypes.scala
 covtest
 StructuralTypes
@@ -86,7 +120,7 @@ false
 false
 "name" -> "Emma"
 
-4
+6
 StructuralTypes.scala
 covtest
 StructuralTypes
@@ -103,7 +137,7 @@ false
 false
 "age" -> 42
 
-5
+7
 StructuralTypes.scala
 covtest
 StructuralTypes
@@ -120,7 +154,7 @@ false
 false
 person.name
 
-6
+8
 StructuralTypes.scala
 covtest
 StructuralTypes
diff --git a/tests/coverage/pos/TypeLambdas.scoverage.check b/tests/coverage/pos/TypeLambdas.scoverage.check
index de519038c367..f5779a45268b 100644
--- a/tests/coverage/pos/TypeLambdas.scoverage.check
+++ b/tests/coverage/pos/TypeLambdas.scoverage.check
@@ -76,6 +76,23 @@ TypeLambdas
 Object
 covtest.TypeLambdas
 test
+367
+377
+17
+apply
+Apply
+false
+0
+false
+("a", "b")
+
+4
+TypeLambdas.scala
+covtest
+TypeLambdas
+Object
+covtest.TypeLambdas
+test
 382
 396
 18
@@ -86,7 +103,7 @@ false
 false
 println(tuple)
 
-4
+5
 TypeLambdas.scala
 covtest
 TypeLambdas
diff --git a/tests/coverage/pos/i21695/A.scala b/tests/coverage/pos/i21695/A.scala
new file mode 100644
index 000000000000..afe534eac46e
--- /dev/null
+++ b/tests/coverage/pos/i21695/A.scala
@@ -0,0 +1,9 @@
+package example
+
+trait A {
+  def x1: Builder[?]
+  def x2: Service
+
+  def create: String =
+    x1.addService(x2).build()
+}
diff --git a/tests/coverage/pos/i21695/Builder.java b/tests/coverage/pos/i21695/Builder.java
new file mode 100644
index 000000000000..c7685043ec00
--- /dev/null
+++ b/tests/coverage/pos/i21695/Builder.java
@@ -0,0 +1,6 @@
+package example;
+
+public abstract class Builder<T extends Builder<T>> {
+  public abstract String build();
+  public abstract T addService(Service service);
+}
diff --git a/tests/coverage/pos/i21695/Service.java b/tests/coverage/pos/i21695/Service.java
new file mode 100644
index 000000000000..624e3c04f67f
--- /dev/null
+++ b/tests/coverage/pos/i21695/Service.java
@@ -0,0 +1,3 @@
+package example;
+
+public class Service{}
diff --git a/tests/coverage/pos/i21695/test.scoverage.check b/tests/coverage/pos/i21695/test.scoverage.check
new file mode 100644
index 000000000000..d9ee3a172e3f
--- /dev/null
+++ b/tests/coverage/pos/i21695/test.scoverage.check
@@ -0,0 +1,71 @@
+# Coverage data, format version: 3.0
+# Statement data:
+# - id
+# - source path
+# - package name
+# - class name
+# - class type (Class, Object or Trait)
+# - full class name
+# - method name
+# - start offset
+# - end offset
+# - line number
+# - symbol name
+# - tree name
+# - is branch
+# - invocations count
+# - is ignored
+# - description (can be multi-line)
+# '' sign
+# ------------------------------------------
+0
+i21695/A.scala
+example
+A
+Trait
+example.A
+create
+94
+119
+8
+build
+Apply
+false
+0
+false
+x1.addService(x2).build()
+
+1
+i21695/A.scala
+example
+A
+Trait
+example.A
+create
+108
+110
+8
+x2
+Select
+false
+0
+false
+x2
+
+2
+i21695/A.scala
+example
+A
+Trait
+example.A
+create
+69
+79
+7
+create
+DefDef
+false
+0
+false
+def create
+
diff --git a/tests/coverage/pos/i21877.scala b/tests/coverage/pos/i21877.scala
new file mode 100644
index 000000000000..13d4c9dfc8e2
--- /dev/null
+++ b/tests/coverage/pos/i21877.scala
@@ -0,0 +1,21 @@
+
+
+class Schema[T]
+object Schema {
+  inline def derived[T]: Schema[T] = new Schema[T]
+}
+
+case class Bar(x: Int)
+
+object Foo {
+  def foo(x: Int): String = {
+    val bar = Bar(x)
+    if (x == 5) "5" else "idk" + bar.toString
+  }
+
+  implicit val schema: Schema[Bar] = Schema.derived
+}
+
+@main def test() =
+  Foo.foo(4)
+  Foo.foo(5)
diff --git a/tests/coverage/pos/i21877.scoverage.check b/tests/coverage/pos/i21877.scoverage.check
new file mode 100644
index 000000000000..7f95bcb7c010
--- /dev/null
+++ b/tests/coverage/pos/i21877.scoverage.check
@@ -0,0 +1,224 @@
+# Coverage data, format version: 3.0
+# Statement data:
+# - id
+# - source path
+# - package name
+# - class name
+# - class type (Class, Object or Trait)
+# - full class name
+# - method name
+# - start offset
+# - end offset
+# - line number
+# - symbol name
+# - tree name
+# - is branch
+# - invocations count
+# - is ignored
+# - description (can be multi-line)
+# '' sign
+# ------------------------------------------
+0
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+169
+175
+12
+apply
+Apply
+false
+0
+false
+Bar(x)
+
+1
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+184
+190
+13
+==
+Apply
+false
+0
+false
+x == 5
+
+2
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+192
+195
+13
+<none>
+Literal
+false
+0
+false
+"5"
+
+3
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+192
+195
+13
+<none>
+Literal
+true
+0
+false
+"5"
+
+4
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+201
+221
+13
++
+Apply
+false
+0
+false
+"idk" + bar.toString
+
+5
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+201
+206
+13
+<none>
+Literal
+false
+0
+false
+"idk"
+
+6
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+209
+221
+13
+toString
+Apply
+false
+0
+false
+bar.toString
+
+7
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+201
+221
+13
++
+Apply
+true
+0
+false
+"idk" + bar.toString
+
+8
+i21877.scala
+<empty>
+Foo
+Object
+<empty>.Foo
+foo
+127
+134
+11
+foo
+DefDef
+false
+0
+false
+def foo
+
+9
+i21877.scala
+<empty>
+i21877$package
+Object
+<empty>.i21877$package
+test
+303
+313
+20
+foo
+Apply
+false
+0
+false
+Foo.foo(4)
+
+10
+i21877.scala
+<empty>
+i21877$package
+Object
+<empty>.i21877$package
+test
+316
+326
+21
+foo
+Apply
+false
+0
+false
+Foo.foo(5)
+
+11
+i21877.scala
+<empty>
+i21877$package
+Object
+<empty>.i21877$package
+test
+282
+296
+19
+test
+DefDef
+false
+0
+false
+@main def test
+
diff --git a/tests/coverage/pos/macro-late-suspend/test.scoverage.check b/tests/coverage/pos/macro-late-suspend/test.scoverage.check
index f962705ed2ce..051f30e08e67 100644
--- a/tests/coverage/pos/macro-late-suspend/test.scoverage.check
+++ b/tests/coverage/pos/macro-late-suspend/test.scoverage.check
@@ -53,23 +53,6 @@ false
 private def mkVisitorTypeImpl
 
 3
-macro-late-suspend/Test.scala
-example
-Test
-Object
-example.Test
-<init>
-102
-121
-8
-<init>
-Apply
-false
-0
-false
-mkVisitorType[Test]
-
-4
 macro-late-suspend/UsesTest.scala
 example
 UsesTest$package
diff --git a/tests/coverage/pos/scoverage-samples-case.scoverage.check b/tests/coverage/pos/scoverage-samples-case.scoverage.check
index 4b67fa77541c..a0fa8febcd99 100644
--- a/tests/coverage/pos/scoverage-samples-case.scoverage.check
+++ b/tests/coverage/pos/scoverage-samples-case.scoverage.check
@@ -24,6 +24,23 @@ org.scoverage.samples
 PriceEngine
 Class
 org.scoverage.samples.PriceEngine
+<init>
+293
+298
+14
+<none>
+Literal
+false
+0
+false
+"abc"
+
+1
+scoverage-samples-case.scala
+org.scoverage.samples
+PriceEngine
+Class
+org.scoverage.samples.PriceEngine
 $anonfun
 362
 368
@@ -35,7 +52,7 @@ false
 false
 stop()
 
-1
+2
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -52,7 +69,7 @@ true
 false
 =>\n      stop()
 
-2
+3
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -69,7 +86,7 @@ false
 false
 stop()
 
-3
+4
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -86,7 +103,7 @@ true
 false
 =>\n      stop()
 
-4
+5
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -103,7 +120,24 @@ false
 false
 def receive
 
-5
+6
+scoverage-samples-case.scala
+org.scoverage.samples
+PriceEngine
+Class
+org.scoverage.samples.PriceEngine
+stop
+443
+462
+25
+!=
+Apply
+false
+0
+false
+cancellable != null
+
+7
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -120,7 +154,7 @@ false
 false
 println("stop")
 
-6
+8
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -137,7 +171,7 @@ true
 false
 println("stop")
 
-7
+9
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
@@ -154,7 +188,7 @@ true
 false
 
 
-8
+10
 scoverage-samples-case.scala
 org.scoverage.samples
 PriceEngine
diff --git a/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check b/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
index f9bb9e0cd6a3..1c349a5de5c8 100644
--- a/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
+++ b/tests/coverage/pos/scoverage-samples-implicit-class.scoverage.check
@@ -25,15 +25,15 @@ CreditEngine
 Class
 org.scoverage.samples.CreditEngine
 $anonfun
-263
-276
-11
-!
+245
+255
+10
+<
 Apply
 false
 0
 false
-"if 1" ! "xd"
+req < 2000
 
 1
 scoverage-samples-implicit-class.scala
@@ -43,14 +43,14 @@ Class
 org.scoverage.samples.CreditEngine
 $anonfun
 263
-269
+276
 11
-StringOpssssss
+!
 Apply
 false
 0
 false
-"if 1"
+"if 1" ! "xd"
 
 2
 scoverage-samples-implicit-class.scala
@@ -161,23 +161,6 @@ StringOpssssss
 Class
 org.scoverage.samples.StringOpssssss
 !
-160
-167
-5
-+
-Apply
-false
-0
-false
-s + "!"
-
-9
-scoverage-samples-implicit-class.scala
-org.scoverage.samples
-StringOpssssss
-Class
-org.scoverage.samples.StringOpssssss
-!
 124
 129
 5
@@ -188,7 +171,7 @@ false
 false
 def !
 
-10
+9
 scoverage-samples-implicit-class.scala
 org.scoverage.samples
 scoverage-samples-implicit-class$package
diff --git a/tests/coverage/run/currying/test.scoverage.check b/tests/coverage/run/currying/test.scoverage.check
index abc1876942db..5d1b4233a226 100644
--- a/tests/coverage/run/currying/test.scoverage.check
+++ b/tests/coverage/run/currying/test.scoverage.check
@@ -25,6 +25,23 @@ Test
 Object
 <empty>.Test
 f1
+48
+53
+2
++
+Apply
+false
+0
+false
+a+b+c
+
+1
+currying/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+f1
 15
 21
 2
@@ -35,7 +52,24 @@ false
 false
 def f1
 
-1
+2
+currying/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+$anonfun
+105
+110
+4
++
+Apply
+false
+0
+false
+a+b+c
+
+3
 currying/test.scala
 <empty>
 Test
@@ -52,7 +86,24 @@ false
 false
 def f2
 
-2
+4
+currying/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+$anonfun
+166
+171
+7
++
+Apply
+false
+0
+false
+a+b+c
+
+5
 currying/test.scala
 <empty>
 Test
@@ -69,7 +120,24 @@ false
 false
 def g1
 
-3
+6
+currying/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+g2
+226
+231
+9
++
+Apply
+false
+0
+false
+a+b+c
+
+7
 currying/test.scala
 <empty>
 Test
@@ -86,7 +154,7 @@ false
 false
 def g2
 
-4
+8
 currying/test.scala
 <empty>
 Test
@@ -103,7 +171,7 @@ false
 false
 println(f1(0)(1)(2))
 
-5
+9
 currying/test.scala
 <empty>
 Test
@@ -120,7 +188,7 @@ false
 false
 f1(0)(1)(2)
 
-6
+10
 currying/test.scala
 <empty>
 Test
@@ -137,7 +205,7 @@ false
 false
 println(f2(0)(1)(2))
 
-7
+11
 currying/test.scala
 <empty>
 Test
@@ -154,58 +222,7 @@ false
 false
 f2(0)(1)(2)
 
-8
-currying/test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-310
-318
-13
-apply
-Apply
-false
-0
-false
-f2(0)(1)
-
-9
-currying/test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-310
-315
-13
-apply
-Apply
-false
-0
-false
-f2(0)
-
-10
-currying/test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-310
-312
-13
-f2
-Ident
-false
-0
-false
-f2
-
-11
+12
 currying/test.scala
 <empty>
 Test
@@ -222,7 +239,7 @@ false
 false
 println(g1(using 0)(using 1)(using 2))
 
-12
+13
 currying/test.scala
 <empty>
 Test
@@ -239,7 +256,7 @@ false
 false
 g1(using 0)(using 1)(using 2)
 
-13
+14
 currying/test.scala
 <empty>
 Test
@@ -256,7 +273,7 @@ false
 false
 println(g2(using 0)(using 1)(using 2))
 
-14
+15
 currying/test.scala
 <empty>
 Test
@@ -273,7 +290,7 @@ false
 false
 g2(using 0)(using 1)(using 2)
 
-15
+16
 currying/test.scala
 <empty>
 Test
diff --git a/tests/coverage/run/extend-case-class/test.scoverage.check b/tests/coverage/run/extend-case-class/test.scoverage.check
index b355140d2520..107cef2cc371 100644
--- a/tests/coverage/run/extend-case-class/test.scoverage.check
+++ b/tests/coverage/run/extend-case-class/test.scoverage.check
@@ -21,6 +21,91 @@
 0
 extend-case-class/test.scala
 <empty>
+DecimalConf
+Object
+<empty>.DecimalConf
+<init>
+194
+198
+4
+<none>
+Literal
+false
+0
+false
+6178
+
+1
+extend-case-class/test.scala
+<empty>
+DecimalConf
+Object
+<empty>.DecimalConf
+<init>
+200
+203
+4
+<none>
+Literal
+false
+0
+false
+308
+
+2
+extend-case-class/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+239
+279
+8
+apply
+Apply
+false
+0
+false
+DecimalConf(MathContext.DECIMAL32, 1, 0)
+
+3
+extend-case-class/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+274
+275
+8
+<none>
+Literal
+false
+0
+false
+1
+
+4
+extend-case-class/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+277
+278
+8
+<none>
+Literal
+false
+0
+false
+0
+
+5
+extend-case-class/test.scala
+<empty>
 test$package
 Object
 <empty>.test$package
@@ -35,7 +120,7 @@ false
 false
 println(c.scaleLimit)
 
-1
+6
 extend-case-class/test.scala
 <empty>
 test$package
@@ -52,7 +137,7 @@ false
 false
 println(DecimalConf.scaleLimit)
 
-2
+7
 extend-case-class/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/i16940/test.scoverage.check b/tests/coverage/run/i16940/test.scoverage.check
index 357080ba9da8..eb8cd5d7d61c 100644
--- a/tests/coverage/run/i16940/test.scoverage.check
+++ b/tests/coverage/run/i16940/test.scoverage.check
@@ -59,23 +59,6 @@ Test
 Object
 <empty>.Test
 <init>
-371
-454
-20
-sequence
-Apply
-false
-0
-false
-Future.sequence(Seq(brokenSynchronizedBlock(false), brokenSynchronizedBlock(true)))
-
-3
-i16940/i16940.scala
-<empty>
-Test
-Object
-<empty>.Test
-<init>
 387
 453
 20
@@ -86,7 +69,7 @@ false
 false
 Seq(brokenSynchronizedBlock(false), brokenSynchronizedBlock(true))
 
-4
+3
 i16940/i16940.scala
 <empty>
 Test
@@ -103,7 +86,7 @@ false
 false
 brokenSynchronizedBlock(false)
 
-5
+4
 i16940/i16940.scala
 <empty>
 Test
@@ -120,7 +103,7 @@ false
 false
 brokenSynchronizedBlock(true)
 
-6
+5
 i16940/i16940.scala
 <empty>
 Test
@@ -137,75 +120,58 @@ false
 false
 println(test)
 
-7
+6
 i16940/i16940.scala
 <empty>
 Test
 Object
 <empty>.Test
-$anonfun
-508
-525
-23
-assertFailed
+<init>
+539
+540
+25
+DurationInt
 Apply
 false
 0
 false
-assert(test == 2)
+3
 
-8
+7
 i16940/i16940.scala
 <empty>
 Test
 Object
 <empty>.Test
-$anonfun
-508
-525
-23
-assertFailed
-Apply
-true
-0
+<init>
+539
+548
+25
+seconds
+Select
 false
-assert(test == 2)
-
-9
-i16940/i16940.scala
-<empty>
-Test
-Object
-<empty>.Test
-$anonfun
-508
-525
-23
-<none>
-Literal
-true
 0
 false
-assert(test == 2)
+3.seconds
 
-10
+8
 i16940/i16940.scala
 <empty>
-Test
+i16940$package
 Object
-<empty>.Test
+<empty>.i16940$package
 <init>
-539
-548
-25
-seconds
-Select
+125
+126
+5
+<none>
+Literal
 false
 0
 false
-3.seconds
+0
 
-11
+9
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -222,7 +188,7 @@ false
 false
 Future {\n  if (option) {\n    Thread.sleep(500)\n  }\n  synchronized {\n    val tmp = test\n    Thread.sleep(1000)\n    test = tmp + 1\n  }\n}
 
-12
+10
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -239,7 +205,7 @@ false
 false
 Thread.sleep(500)
 
-13
+11
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -256,7 +222,7 @@ true
 false
 {\n    Thread.sleep(500)\n  }
 
-14
+12
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -273,7 +239,7 @@ true
 false
 
 
-15
+13
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -290,7 +256,7 @@ false
 false
 synchronized {\n    val tmp = test\n    Thread.sleep(1000)\n    test = tmp + 1\n  }
 
-16
+14
 i16940/i16940.scala
 <empty>
 i16940$package
@@ -307,7 +273,24 @@ false
 false
 Thread.sleep(1000)
 
-17
+15
+i16940/i16940.scala
+<empty>
+i16940$package
+Object
+<empty>.i16940$package
+brokenSynchronizedBlock
+310
+317
+14
++
+Apply
+false
+0
+false
+tmp + 1
+
+16
 i16940/i16940.scala
 <empty>
 i16940$package
diff --git a/tests/coverage/run/i18233-min/test.scoverage.check b/tests/coverage/run/i18233-min/test.scoverage.check
index 7570ebaaed96..6bc38ed61a85 100644
--- a/tests/coverage/run/i18233-min/test.scoverage.check
+++ b/tests/coverage/run/i18233-min/test.scoverage.check
@@ -42,23 +42,6 @@ Test
 Object
 <empty>.Test
 <init>
-139
-144
-11
-aList
-Ident
-false
-0
-false
-aList
-
-2
-i18233-min/i18233-min.scala
-<empty>
-Test
-Object
-<empty>.Test
-<init>
 148
 168
 12
@@ -69,24 +52,7 @@ false
 false
 println(anotherList)
 
-3
-i18233-min/i18233-min.scala
-<empty>
-Test
-Object
-<empty>.Test
-<init>
-156
-167
-12
-anotherList
-Ident
-false
-0
-false
-anotherList
-
-4
+2
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -103,7 +69,7 @@ false
 false
 List(Array[String]()*)
 
-5
+3
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -120,7 +86,7 @@ false
 false
 Array[String]()
 
-6
+4
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -137,7 +103,7 @@ false
 false
 def aList
 
-7
+5
 i18233-min/i18233-min.scala
 <empty>
 i18233-min$package
@@ -154,6 +120,40 @@ false
 false
 Array("abc", "def")
 
+6
+i18233-min/i18233-min.scala
+<empty>
+i18233-min$package
+Object
+<empty>.i18233-min$package
+arr
+56
+61
+5
+<none>
+Literal
+false
+0
+false
+"abc"
+
+7
+i18233-min/i18233-min.scala
+<empty>
+i18233-min$package
+Object
+<empty>.i18233-min$package
+arr
+63
+68
+5
+<none>
+Literal
+false
+0
+false
+"def"
+
 8
 i18233-min/i18233-min.scala
 <empty>
diff --git a/tests/coverage/run/inheritance/test.scoverage.check b/tests/coverage/run/inheritance/test.scoverage.check
index 387a080463e2..48b8e02d59e1 100644
--- a/tests/coverage/run/inheritance/test.scoverage.check
+++ b/tests/coverage/run/inheritance/test.scoverage.check
@@ -21,6 +21,23 @@
 0
 inheritance/test.scala
 <empty>
+B
+Class
+<empty>.B
+<init>
+61
+62
+2
+<none>
+Literal
+false
+0
+false
+0
+
+1
+inheritance/test.scala
+<empty>
 C1
 Class
 <empty>.C1
@@ -35,7 +52,24 @@ false
 false
 println("block")
 
+2
+inheritance/test.scala
+<empty>
+C1
+Class
+<empty>.C1
+<init>
+102
+103
+3
+<none>
+Literal
+false
+0
+false
 1
+
+3
 inheritance/test.scala
 <empty>
 C2
@@ -52,7 +86,7 @@ false
 false
 A(2,2)
 
-2
+4
 inheritance/test.scala
 <empty>
 test$package
@@ -69,7 +103,7 @@ false
 false
 println(C1().x)
 
-3
+5
 inheritance/test.scala
 <empty>
 test$package
@@ -86,7 +120,7 @@ false
 false
 C1()
 
-4
+6
 inheritance/test.scala
 <empty>
 test$package
@@ -103,7 +137,7 @@ false
 false
 println(C2().x)
 
-5
+7
 inheritance/test.scala
 <empty>
 test$package
@@ -120,7 +154,7 @@ false
 false
 C2()
 
-6
+8
 inheritance/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/inline-def/test.scoverage.check b/tests/coverage/run/inline-def/test.scoverage.check
index 17fa7c049107..7ca855c41008 100644
--- a/tests/coverage/run/inline-def/test.scoverage.check
+++ b/tests/coverage/run/inline-def/test.scoverage.check
@@ -76,23 +76,6 @@ test$package
 Object
 <empty>.test$package
 Test
-134
-148
-8
-toString
-Apply
-false
-0
-false
-"foo".toString
-
-4
-inline-def/test.scala
-<empty>
-test$package
-Object
-<empty>.test$package
-Test
 263
 277
 16
@@ -103,24 +86,7 @@ false
 false
 println(a.bar)
 
-5
-inline-def/test.scala
-<empty>
-test$package
-Object
-<empty>.test$package
-Test
-176
-190
-9
-toString
-Apply
-false
-0
-false
-"bar".toString
-
-6
+4
 inline-def/test.scala
 <empty>
 test$package
@@ -137,7 +103,7 @@ false
 false
 println(b.foo)
 
-7
+5
 inline-def/test.scala
 <empty>
 test$package
@@ -154,7 +120,7 @@ false
 false
 b.foo
 
-8
+6
 inline-def/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/interpolation/test.scoverage.check b/tests/coverage/run/interpolation/test.scoverage.check
index 37562dab5509..3147a19a61a0 100644
--- a/tests/coverage/run/interpolation/test.scoverage.check
+++ b/tests/coverage/run/interpolation/test.scoverage.check
@@ -127,15 +127,15 @@ Test
 Object
 <empty>.Test
 main
-229
-278
-11
-map
-Apply
+200
+203
+10
+<none>
+Literal
 false
 0
 false
-xs.zipWithIndex.map((s, i) => println(s"$i: $s"))
+"d"
 
 7
 interpolation/test.scala
@@ -144,17 +144,85 @@ Test
 Object
 <empty>.Test
 main
+205
+208
+10
+<none>
+Literal
+false
+0
+false
+"o"
+
+8
+interpolation/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+main
+210
+213
+10
+<none>
+Literal
+false
+0
+false
+"t"
+
+9
+interpolation/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+main
+215
+218
+10
+<none>
+Literal
+false
+0
+false
+"t"
+
+10
+interpolation/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+main
+220
+223
+10
+<none>
+Literal
+false
+0
+false
+"y"
+
+11
+interpolation/test.scala
+<empty>
+Test
+Object
+<empty>.Test
+main
 229
-244
+278
 11
-zipWithIndex
-Select
+map
+Apply
 false
 0
 false
-xs.zipWithIndex
+xs.zipWithIndex.map((s, i) => println(s"$i: $s"))
 
-8
+12
 interpolation/test.scala
 <empty>
 Test
@@ -171,7 +239,7 @@ false
 false
 println(s"$i: $s")
 
-9
+13
 interpolation/test.scala
 <empty>
 Test
@@ -188,7 +256,7 @@ false
 false
 s"$i: $s"
 
-10
+14
 interpolation/test.scala
 <empty>
 Test
@@ -205,7 +273,7 @@ false
 false
 println(simple(1, "abc"))
 
-11
+15
 interpolation/test.scala
 <empty>
 Test
@@ -222,7 +290,7 @@ false
 false
 simple(1, "abc")
 
-12
+16
 interpolation/test.scala
 <empty>
 Test
@@ -239,7 +307,7 @@ false
 false
 println(hexa(127))
 
-13
+17
 interpolation/test.scala
 <empty>
 Test
@@ -256,7 +324,7 @@ false
 false
 hexa(127)
 
-14
+18
 interpolation/test.scala
 <empty>
 Test
@@ -273,7 +341,7 @@ false
 false
 println(raw"a\\nb")
 
-15
+19
 interpolation/test.scala
 <empty>
 Test
@@ -290,7 +358,7 @@ false
 false
 raw"a\\nb"
 
-16
+20
 interpolation/test.scala
 <empty>
 Test
diff --git a/tests/coverage/run/java-methods/test.scoverage.check b/tests/coverage/run/java-methods/test.scoverage.check
index 891af1804831..679a5b7dbff4 100644
--- a/tests/coverage/run/java-methods/test.scoverage.check
+++ b/tests/coverage/run/java-methods/test.scoverage.check
@@ -58,6 +58,23 @@ java-methods/test.scala
 test$package
 Object
 <empty>.test$package
+$anonfun
+124
+126
+6
+<none>
+Literal
+false
+0
+false
+()
+
+3
+java-methods/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
 Test
 140
 152
@@ -69,7 +86,7 @@ false
 false
 JavaObject()
 
-3
+4
 java-methods/test.scala
 <empty>
 test$package
@@ -86,7 +103,7 @@ false
 false
 obj.f()
 
-4
+5
 java-methods/test.scala
 <empty>
 test$package
@@ -103,7 +120,7 @@ false
 false
 println(obj.identity[Int](0))
 
-5
+6
 java-methods/test.scala
 <empty>
 test$package
@@ -120,7 +137,7 @@ false
 false
 obj.identity[Int](0)
 
-6
+7
 java-methods/test.scala
 <empty>
 test$package
@@ -137,7 +154,7 @@ false
 false
 println("ok!")
 
-7
+8
 java-methods/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/lifting-bool/test.scoverage.check b/tests/coverage/run/lifting-bool/test.scoverage.check
index 5eb3d864939f..7ed81d8b535c 100644
--- a/tests/coverage/run/lifting-bool/test.scoverage.check
+++ b/tests/coverage/run/lifting-bool/test.scoverage.check
@@ -76,6 +76,40 @@ test$package
 Object
 <empty>.test$package
 Test
+101
+120
+8
+||
+Apply
+false
+0
+false
+true || notCalled()
+
+4
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+101
+105
+8
+<none>
+Literal
+false
+0
+false
+true
+
+5
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
 109
 120
 8
@@ -86,7 +120,41 @@ false
 false
 notCalled()
 
-4
+6
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+150
+170
+9
+&&
+Apply
+false
+0
+false
+false && notCalled()
+
+7
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+150
+155
+9
+<none>
+Literal
+false
+0
+false
+false
+
+8
 lifting-bool/test.scala
 <empty>
 test$package
@@ -103,7 +171,41 @@ false
 false
 notCalled()
 
-5
+9
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+200
+230
+10
+||
+Apply
+false
+0
+false
+(true || false) || notCalled()
+
+10
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+201
+205
+10
+<none>
+Literal
+false
+0
+false
+true
+
+11
 lifting-bool/test.scala
 <empty>
 test$package
@@ -120,7 +222,75 @@ false
 false
 notCalled()
 
-6
+12
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+249
+278
+11
+&&
+Apply
+false
+0
+false
+true && (false && notCalled()
+
+13
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+249
+253
+11
+<none>
+Literal
+false
+0
+false
+true
+
+14
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+258
+278
+11
+&&
+Apply
+false
+0
+false
+false && notCalled()
+
+15
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+258
+263
+11
+<none>
+Literal
+false
+0
+false
+false
+
+16
 lifting-bool/test.scala
 <empty>
 test$package
@@ -137,7 +307,41 @@ false
 false
 notCalled()
 
-7
+17
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+299
+329
+12
+&&
+Apply
+false
+0
+false
+(true && false) && notCalled()
+
+18
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+300
+304
+12
+<none>
+Literal
+false
+0
+false
+true
+
+19
 lifting-bool/test.scala
 <empty>
 test$package
@@ -154,7 +358,7 @@ false
 false
 notCalled()
 
-8
+20
 lifting-bool/test.scala
 <empty>
 test$package
@@ -171,7 +375,7 @@ false
 false
 println(s"$a $b $c $d $e")
 
-9
+21
 lifting-bool/test.scala
 <empty>
 test$package
@@ -188,7 +392,7 @@ false
 false
 s"$a $b $c $d $e"
 
-10
+22
 lifting-bool/test.scala
 <empty>
 test$package
@@ -205,7 +409,7 @@ false
 false
 f(true, false)
 
-11
+23
 lifting-bool/test.scala
 <empty>
 test$package
@@ -222,7 +426,7 @@ false
 false
 println(x)
 
-12
+24
 lifting-bool/test.scala
 <empty>
 test$package
@@ -239,7 +443,41 @@ false
 false
 f(true || notCalled(), false && notCalled())
 
-13
+25
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+424
+443
+18
+||
+Apply
+false
+0
+false
+true || notCalled()
+
+26
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+424
+428
+18
+<none>
+Literal
+false
+0
+false
+true
+
+27
 lifting-bool/test.scala
 <empty>
 test$package
@@ -256,7 +494,41 @@ false
 false
 notCalled()
 
-14
+28
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+445
+465
+18
+&&
+Apply
+false
+0
+false
+false && notCalled()
+
+29
+lifting-bool/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+445
+450
+18
+<none>
+Literal
+false
+0
+false
+false
+
+30
 lifting-bool/test.scala
 <empty>
 test$package
@@ -273,7 +545,7 @@ false
 false
 notCalled()
 
-15
+31
 lifting-bool/test.scala
 <empty>
 test$package
@@ -290,7 +562,7 @@ false
 false
 println(x)
 
-16
+32
 lifting-bool/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/lifting/test.scoverage.check b/tests/coverage/run/lifting/test.scoverage.check
index 136b8e2e4fbb..f876ba013f46 100644
--- a/tests/coverage/run/lifting/test.scoverage.check
+++ b/tests/coverage/run/lifting/test.scoverage.check
@@ -42,15 +42,15 @@ Vals
 Class
 <empty>.Vals
 <init>
-41
-57
-3
-::
-Apply
+27
+28
+2
+<none>
+Literal
 false
 0
 false
-l :: List(1,2,3)
+1
 
 2
 lifting/test.scala
@@ -59,66 +59,66 @@ Vals
 Class
 <empty>.Vals
 <init>
-46
+41
 57
 3
-apply
+::
 Apply
 false
 0
 false
-List(1,2,3)
+l :: List(1,2,3)
 
 3
 lifting/test.scala
 <empty>
-A
+Vals
 Class
-<empty>.A
-msg
-104
-136
-6
-+
-Apply
+<empty>.Vals
+<init>
+51
+52
+3
+<none>
+Literal
 false
 0
 false
-"string" + a + "." + b + "." + c
+1
 
 4
 lifting/test.scala
 <empty>
-A
+Vals
 Class
-<empty>.A
-msg
-104
-132
-6
-+
-Apply
+<empty>.Vals
+<init>
+53
+54
+3
+<none>
+Literal
 false
 0
 false
-"string" + a + "." + b + "."
+2
 
 5
 lifting/test.scala
 <empty>
-A
+Vals
 Class
-<empty>.A
-msg
-104
-126
-6
-+
-Apply
+<empty>.Vals
+<init>
+55
+56
+3
+<none>
+Literal
 false
 0
 false
-"string" + a + "." + b
+3
 
 6
 lifting/test.scala
@@ -128,14 +128,14 @@ Class
 <empty>.A
 msg
 104
-122
+136
 6
 +
 Apply
 false
 0
 false
-"string" + a + "."
+"string" + a + "." + b + "." + c
 
 7
 lifting/test.scala
@@ -145,14 +145,14 @@ Class
 <empty>.A
 msg
 104
-116
+112
 6
-+
-Apply
+<none>
+Literal
 false
 0
 false
-"string" + a
+"string"
 
 8
 lifting/test.scala
@@ -178,6 +178,23 @@ A
 Class
 <empty>.A
 integer
+158
+159
+7
+<none>
+Literal
+false
+0
+false
+0
+
+10
+lifting/test.scala
+<empty>
+A
+Class
+<empty>.A
+integer
 139
 150
 7
@@ -188,7 +205,7 @@ false
 false
 def integer
 
-10
+11
 lifting/test.scala
 <empty>
 A
@@ -205,7 +222,7 @@ false
 false
 def ex
 
-11
+12
 lifting/test.scala
 <empty>
 test$package
@@ -222,7 +239,41 @@ false
 false
 A()
 
-12
+13
+lifting/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+235
+238
+13
+<none>
+Literal
+false
+0
+false
+123
+
+14
+lifting/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+f
+251
+253
+14
+<none>
+Literal
+false
+0
+false
+-1
+
+15
 lifting/test.scala
 <empty>
 test$package
@@ -239,7 +290,7 @@ false
 false
 def f
 
-13
+16
 lifting/test.scala
 <empty>
 test$package
@@ -256,7 +307,24 @@ false
 false
 a.msg(i, 0, a.integer)
 
-14
+17
+lifting/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+273
+274
+15
+<none>
+Literal
+false
+0
+false
+0
+
+18
 lifting/test.scala
 <empty>
 test$package
@@ -273,7 +341,7 @@ false
 false
 a.integer
 
-15
+19
 lifting/test.scala
 <empty>
 test$package
@@ -290,7 +358,7 @@ false
 false
 println(x)
 
-16
+20
 lifting/test.scala
 <empty>
 test$package
@@ -307,24 +375,24 @@ false
 false
 a.ex.msg(i, 0, a.ex.integer)
 
-17
+21
 lifting/test.scala
 <empty>
 test$package
 Object
 <empty>.test$package
 Test
-306
-310
+318
+319
 17
-ex
-Select
+<none>
+Literal
 false
 0
 false
-a.ex
+0
 
-18
+22
 lifting/test.scala
 <empty>
 test$package
@@ -341,7 +409,7 @@ false
 false
 a.ex
 
-19
+23
 lifting/test.scala
 <empty>
 test$package
@@ -358,7 +426,7 @@ false
 false
 a.ex.integer
 
-20
+24
 lifting/test.scala
 <empty>
 test$package
@@ -375,7 +443,7 @@ false
 false
 println(x)
 
-21
+25
 lifting/test.scala
 <empty>
 test$package
@@ -392,7 +460,7 @@ false
 false
 a.msg(f(), 0, i)
 
-22
+26
 lifting/test.scala
 <empty>
 test$package
@@ -409,7 +477,24 @@ false
 false
 f()
 
-23
+27
+lifting/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+365
+366
+19
+<none>
+Literal
+false
+0
+false
+0
+
+28
 lifting/test.scala
 <empty>
 test$package
@@ -426,7 +511,7 @@ false
 false
 println(x)
 
-24
+29
 lifting/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/macro-suspend/test.scoverage.check b/tests/coverage/run/macro-suspend/test.scoverage.check
index 759897eb7747..4cae5a319598 100644
--- a/tests/coverage/run/macro-suspend/test.scoverage.check
+++ b/tests/coverage/run/macro-suspend/test.scoverage.check
@@ -76,6 +76,23 @@ Greeting
 Object
 <empty>.Greeting
 greet
+252
+259
+8
+<none>
+Literal
+false
+0
+false
+"hello"
+
+4
+macro-suspend/Macro.scala
+<empty>
+Greeting
+Object
+<empty>.Greeting
+greet
 238
 247
 8
@@ -86,7 +103,7 @@ false
 false
 def greet
 
-4
+5
 macro-suspend/Test.scala
 <empty>
 Test
@@ -103,23 +120,6 @@ false
 false
 println(Macro.decorate(Greeting.greet()))
 
-5
-macro-suspend/Test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-65
-97
-3
-+
-Apply
-false
-0
-false
-Macro.decorate(Greeting.greet())
-
 6
 macro-suspend/Test.scala
 <empty>
@@ -127,40 +127,6 @@ Test
 Object
 <empty>.Test
 main
-65
-97
-3
-+
-Apply
-false
-0
-false
-Macro.decorate(Greeting.greet())
-
-7
-macro-suspend/Test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
-80
-96
-3
-greet
-Apply
-false
-0
-false
-Greeting.greet()
-
-8
-macro-suspend/Test.scala
-<empty>
-Test
-Object
-<empty>.Test
-main
 15
 23
 2
diff --git a/tests/coverage/run/parameterless/test.scoverage.check b/tests/coverage/run/parameterless/test.scoverage.check
index 5050180e7886..b792ce9c73ea 100644
--- a/tests/coverage/run/parameterless/test.scoverage.check
+++ b/tests/coverage/run/parameterless/test.scoverage.check
@@ -42,6 +42,23 @@ O
 Object
 <empty>.O
 f
+51
+60
+4
+<none>
+Literal
+false
+0
+false
+"O.f_res"
+
+2
+parameterless/test.scala
+<empty>
+O
+Object
+<empty>.O
+f
 12
 17
 2
@@ -52,7 +69,7 @@ false
 false
 def f
 
-2
+3
 parameterless/test.scala
 <empty>
 O
@@ -69,7 +86,24 @@ false
 false
 println("O.g")
 
-3
+4
+parameterless/test.scala
+<empty>
+O
+Object
+<empty>.O
+g
+106
+115
+8
+<none>
+Literal
+false
+0
+false
+"O.g_res"
+
+5
 parameterless/test.scala
 <empty>
 O
@@ -86,7 +120,7 @@ false
 false
 def g
 
-4
+6
 parameterless/test.scala
 <empty>
 test$package
@@ -103,7 +137,24 @@ false
 false
 println("f")
 
-5
+7
+parameterless/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+f
+179
+186
+14
+<none>
+Literal
+false
+0
+false
+"f_res"
+
+8
 parameterless/test.scala
 <empty>
 test$package
@@ -120,7 +171,7 @@ false
 false
 def f
 
-6
+9
 parameterless/test.scala
 <empty>
 test$package
@@ -137,7 +188,24 @@ false
 false
 println("g")
 
-7
+10
+parameterless/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+g
+230
+237
+18
+<none>
+Literal
+false
+0
+false
+"g_res"
+
+11
 parameterless/test.scala
 <empty>
 test$package
@@ -154,7 +222,7 @@ false
 false
 def g
 
-8
+12
 parameterless/test.scala
 <empty>
 test$package
@@ -171,7 +239,7 @@ false
 false
 f
 
-9
+13
 parameterless/test.scala
 <empty>
 test$package
@@ -188,7 +256,7 @@ false
 false
 g
 
-10
+14
 parameterless/test.scala
 <empty>
 test$package
@@ -205,24 +273,7 @@ false
 false
 println(f)
 
-11
-parameterless/test.scala
-<empty>
-test$package
-Object
-<empty>.test$package
-Test
-273
-274
-22
-f
-Ident
-false
-0
-false
-f
-
-12
+15
 parameterless/test.scala
 <empty>
 test$package
@@ -239,7 +290,7 @@ false
 false
 println(g)
 
-13
+16
 parameterless/test.scala
 <empty>
 test$package
@@ -256,7 +307,7 @@ false
 false
 g
 
-14
+17
 parameterless/test.scala
 <empty>
 test$package
@@ -273,7 +324,7 @@ false
 false
 println(O.f)
 
-15
+18
 parameterless/test.scala
 <empty>
 test$package
@@ -290,7 +341,7 @@ false
 false
 O.f
 
-16
+19
 parameterless/test.scala
 <empty>
 test$package
@@ -307,7 +358,7 @@ false
 false
 println(O.g)
 
-17
+20
 parameterless/test.scala
 <empty>
 test$package
@@ -324,7 +375,7 @@ false
 false
 O.g
 
-18
+21
 parameterless/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/trait/test.scoverage.check b/tests/coverage/run/trait/test.scoverage.check
index 19a88ebc7f6f..1f921a3bfae8 100644
--- a/tests/coverage/run/trait/test.scoverage.check
+++ b/tests/coverage/run/trait/test.scoverage.check
@@ -25,6 +25,23 @@ T1
 Trait
 <empty>.T1
 x
+20
+21
+2
+<none>
+Literal
+false
+0
+false
+0
+
+1
+trait/test.scala
+<empty>
+T1
+Trait
+<empty>.T1
+x
 12
 17
 2
@@ -35,7 +52,24 @@ false
 false
 def x
 
-1
+2
+trait/test.scala
+<empty>
+Impl2
+Class
+<empty>.Impl2
+<init>
+94
+100
+7
+<none>
+Literal
+false
+0
+false
+"test"
+
+3
 trait/test.scala
 <empty>
 Impl3
@@ -52,7 +86,7 @@ false
 false
 Impl2()
 
-2
+4
 trait/test.scala
 <empty>
 test$package
@@ -69,7 +103,7 @@ false
 false
 println(Impl1().x)
 
-3
+5
 trait/test.scala
 <empty>
 test$package
@@ -86,7 +120,7 @@ false
 false
 Impl1()
 
-4
+6
 trait/test.scala
 <empty>
 test$package
@@ -103,7 +137,7 @@ false
 false
 Impl1().x
 
-5
+7
 trait/test.scala
 <empty>
 test$package
@@ -120,7 +154,7 @@ false
 false
 println(Impl2().p)
 
-6
+8
 trait/test.scala
 <empty>
 test$package
@@ -137,7 +171,7 @@ false
 false
 Impl2()
 
-7
+9
 trait/test.scala
 <empty>
 test$package
@@ -154,7 +188,7 @@ false
 false
 println(Impl3().p)
 
-8
+10
 trait/test.scala
 <empty>
 test$package
@@ -171,7 +205,7 @@ false
 false
 Impl3()
 
-9
+11
 trait/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/type-apply/test.measurement.check b/tests/coverage/run/type-apply/test.measurement.check
index f1d6ee365359..e199fee6b817 100644
--- a/tests/coverage/run/type-apply/test.measurement.check
+++ b/tests/coverage/run/type-apply/test.measurement.check
@@ -1,5 +1,7 @@
-4
+6
 1
 2
 3
+4
+5
 0
diff --git a/tests/coverage/run/type-apply/test.scoverage.check b/tests/coverage/run/type-apply/test.scoverage.check
index 7d76b11f2f8b..c20e88c0351d 100644
--- a/tests/coverage/run/type-apply/test.scoverage.check
+++ b/tests/coverage/run/type-apply/test.scoverage.check
@@ -59,15 +59,15 @@ test$package
 Object
 <empty>.test$package
 Test
-171
-182
+176
+177
 5
-apply
-Apply
+<none>
+Literal
 false
 0
 false
-List(1,2,3)
+1
 
 3
 type-apply/test.scala
@@ -75,6 +75,40 @@ type-apply/test.scala
 test$package
 Object
 <empty>.test$package
+Test
+178
+179
+5
+<none>
+Literal
+false
+0
+false
+2
+
+4
+type-apply/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
+Test
+180
+181
+5
+<none>
+Literal
+false
+0
+false
+3
+
+5
+type-apply/test.scala
+<empty>
+test$package
+Object
+<empty>.test$package
 $anonfun
 192
 199
@@ -86,7 +120,7 @@ false
 false
 List(a)
 
-4
+6
 type-apply/test.scala
 <empty>
 test$package
diff --git a/tests/coverage/run/varargs/test.scoverage.check b/tests/coverage/run/varargs/test.scoverage.check
index 3c31f9388409..024156dcfeb6 100644
--- a/tests/coverage/run/varargs/test.scoverage.check
+++ b/tests/coverage/run/varargs/test.scoverage.check
@@ -25,6 +25,23 @@ test_1$package
 Object
 <empty>.test_1$package
 repeated
+75
+77
+4
+<none>
+Literal
+false
+0
+false
+()
+
+1
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+repeated
 48
 60
 4
@@ -35,7 +52,7 @@ false
 false
 def repeated
 
-1
+2
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -52,7 +69,7 @@ false
 false
 def f
 
-2
+3
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -69,7 +86,7 @@ false
 false
 repeated()
 
-3
+4
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -86,7 +103,7 @@ false
 false
 repeated(f(""), "b")
 
-4
+5
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -103,7 +120,24 @@ false
 false
 f("")
 
-5
+6
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+149
+152
+11
+<none>
+Literal
+false
+0
+false
+"b"
+
+7
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -120,7 +154,7 @@ false
 false
 JavaVarargs_1.method()
 
-6
+8
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -137,7 +171,24 @@ false
 false
 JavaVarargs_1.method("")
 
-7
+9
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+202
+204
+13
+<none>
+Literal
+false
+0
+false
+""
+
+10
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -154,7 +205,24 @@ false
 false
 JavaVarargs_1.multiple("first")
 
-8
+11
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+240
+247
+15
+<none>
+Literal
+false
+0
+false
+"first"
+
+12
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -171,7 +239,7 @@ false
 false
 println(m)
 
-9
+13
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -188,7 +256,7 @@ false
 false
 JavaVarargs_1.multiple(f("first"))
 
-10
+14
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -205,7 +273,7 @@ false
 false
 f("first")
 
-11
+15
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -222,7 +290,7 @@ false
 false
 println(m)
 
-12
+16
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -239,7 +307,7 @@ false
 false
 JavaVarargs_1.multiple(f("first"), "a", "b", "c")
 
-13
+17
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -256,7 +324,58 @@ false
 false
 f("first")
 
-14
+18
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+357
+360
+19
+<none>
+Literal
+false
+0
+false
+"a"
+
+19
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+362
+365
+19
+<none>
+Literal
+false
+0
+false
+"b"
+
+20
+varargs/test_1.scala
+<empty>
+test_1$package
+Object
+<empty>.test_1$package
+Test
+367
+370
+19
+<none>
+Literal
+false
+0
+false
+"c"
+
+21
 varargs/test_1.scala
 <empty>
 test_1$package
@@ -273,7 +392,7 @@ false
 false
 println(m)
 
-15
+22
 varargs/test_1.scala
 <empty>
 test_1$package