Merge branch 'main' into drop-stdlib-plugin

Author: hamzaremmal

compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

@@ -716,8 +716,13 @@ class TreePickler(pickler: TastyPickler, attributes: Attributes) {
           if passesConditionForErroringBestEffortCode(tree.hasType) then pickleType(tree.tpe)
           else pickleErrorType()
         case SingletonTypeTree(ref) =>
-          writeByte(SINGLETONtpt)
-          pickleTree(ref)
+          val tp = ref.tpe
+          val tp1 = tp.deskolemized
+          if tp1 ne tp then
+            pickleType(tp1)
+          else
+            writeByte(SINGLETONtpt)
+            pickleTree(ref)
         case RefinedTypeTree(parent, refinements) =>
           if (refinements.isEmpty) pickleTree(parent)
           else {

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

@@ -2030,7 +2030,8 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
           case mt: MethodType =>
             pt.findFunctionType match {
               case SAMType(samMeth, samParent)
-              if !defn.isFunctionNType(samParent) && mt <:< samMeth =>
+              if !ctx.erasedTypes && !defn.isFunctionNType(samParent)
+                  && mt <:< samMeth && !mt.isImplicitMethod =>
                 if defn.isContextFunctionType(mt.resultType) then
                   report.error(
                     em"""Implementation restriction: cannot convert this expression to `$samParent`

project/Build.scala

@@ -102,7 +102,7 @@ object Build {
    *
    *  Warning: Change of this variable needs to be consulted with `expectedTastyVersion`
    */
-  val referenceVersion = "3.7.1-RC1"
+  val referenceVersion = "3.7.1-RC2"
 
   /** Version of the Scala compiler targeted in the current release cycle
    *  Contains a version without RC/SNAPSHOT/NIGHTLY specific suffixes

tests/neg-custom-args/captures/i23234.scala

@@ -0,0 +1,5 @@
+abstract class MyFun:
+  def apply(x: Int): Int
+
+object Test:
+  val myFun: MyFun = (x: Int) ?=> x + 10 // error

tests/pos/i23194.scala

@@ -0,0 +1,14 @@
+class R[T] extends annotation.StaticAnnotation
+
+class A[T]:
+  val next: A[T] = null
+  val self: this.type = this
+  val selfnext: this.next.type = this.next
+  def f: (A[T] @R[this.type], A[T] @R[this.next.type]) = ???
+  def g: (A[T] @R[self.type], A[T] @R[selfnext.type]) = ???
+
+class Test:
+  def test =
+    val (a, b) = A[String]().f
+    val (a2, b2) = A[String]().g
+