Skip to content

Commit

Permalink
Priority warning fix alternative (scala#20487)
Browse files Browse the repository at this point in the history
Warn about priority change in implicit search only if one of the
participating candidates appears in the final result.

It could be that we have an priority change between two ranked
candidates that both are superseded by the result of the implicit
search. In this case, no warning needs to be reported.

This PR is scala#20480 with different code for the last commit. I tried to
avoid entangling the priority handling too much in the returns types and
spent a side effect instead. I believe it's more efficient that way,
since priority warnings are very rare.

Fixes scala#20484
  • Loading branch information
hamzaremmal authored May 28, 2024
2 parents d1b51dc + 3112bb7 commit 6e86ada
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 13 deletions.
40 changes: 33 additions & 7 deletions compiler/src/dotty/tools/dotc/typer/Implicits.scala
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,12 @@ object Implicits:
sealed abstract class SearchResult extends Showable {
def tree: Tree
def toText(printer: Printer): Text = printer.toText(this)

/** The references that were found, there can be two of them in the case
* of an AmbiguousImplicits failure
*/
def found: List[TermRef]

def recoverWith(other: SearchFailure => SearchResult): SearchResult = this match {
case _: SearchSuccess => this
case fail: SearchFailure => other(fail)
Expand All @@ -434,13 +440,17 @@ object Implicits:
* @param tstate The typer state to be committed if this alternative is chosen
*/
case class SearchSuccess(tree: Tree, ref: TermRef, level: Int, isExtension: Boolean = false)(val tstate: TyperState, val gstate: GadtConstraint)
extends SearchResult with RefAndLevel with Showable
extends SearchResult with RefAndLevel with Showable:
final def found = ref :: Nil

/** A failed search */
case class SearchFailure(tree: Tree) extends SearchResult {
require(tree.tpe.isInstanceOf[SearchFailureType], s"unexpected type for ${tree}")
final def isAmbiguous: Boolean = tree.tpe.isInstanceOf[AmbiguousImplicits | TooUnspecific]
final def reason: SearchFailureType = tree.tpe.asInstanceOf[SearchFailureType]
final def found = tree.tpe match
case tpe: AmbiguousImplicits => tpe.alt1.ref :: tpe.alt2.ref :: Nil
case _ => Nil
}

object SearchFailure {
Expand Down Expand Up @@ -1290,6 +1300,12 @@ trait Implicits:
/** Search a list of eligible implicit references */
private def searchImplicit(eligible: List[Candidate], contextual: Boolean): SearchResult =

// A map that associates a priority change warning (between -source 3.4 and 3.6)
// with the candidate refs mentioned in the warning. We report the associated
// message if both candidates qualify in tryImplicit and at least one of the candidates
// is part of the result of the implicit search.
val priorityChangeWarnings = mutable.ListBuffer[(TermRef, TermRef, Message)]()

/** Compare `alt1` with `alt2` to determine which one should be chosen.
*
* @return a number > 0 if `alt1` is preferred over `alt2`
Expand All @@ -1306,6 +1322,8 @@ trait Implicits:
*/
def compareAlternatives(alt1: RefAndLevel, alt2: RefAndLevel): Int =
def comp(using Context) = explore(compare(alt1.ref, alt2.ref, preferGeneral = true))
def warn(msg: Message) =
priorityChangeWarnings += ((alt1.ref, alt2.ref, msg))
if alt1.ref eq alt2.ref then 0
else if alt1.level != alt2.level then alt1.level - alt2.level
else
Expand All @@ -1319,16 +1337,16 @@ trait Implicits:
case 1 => "the first alternative"
case _ => "none - it's ambiguous"
if sv.stable == SourceVersion.`3.5` then
report.warning(
warn(
em"""Given search preference for $pt between alternatives ${alt1.ref} and ${alt2.ref} will change
|Current choice : ${choice(prev)}
|New choice from Scala 3.6: ${choice(cmp)}""", srcPos)
|New choice from Scala 3.6: ${choice(cmp)}""")
prev
else
report.warning(
warn(
em"""Change in given search preference for $pt between alternatives ${alt1.ref} and ${alt2.ref}
|Previous choice : ${choice(prev)}
|New choice from Scala 3.6: ${choice(cmp)}""", srcPos)
|New choice from Scala 3.6: ${choice(cmp)}""")
cmp
else cmp
else cmp
Expand Down Expand Up @@ -1423,7 +1441,11 @@ trait Implicits:
// need a candidate better than `cand`
healAmbiguous(fail, newCand =>
compareAlternatives(newCand, cand) > 0)
else rank(remaining, found, fail :: rfailures)
else
// keep only warnings that don't involve the failed candidate reference
priorityChangeWarnings.filterInPlace: (ref1, ref2, _) =>
ref1 != cand.ref && ref2 != cand.ref
rank(remaining, found, fail :: rfailures)
case best: SearchSuccess =>
if (ctx.mode.is(Mode.ImplicitExploration) || isCoherent)
best
Expand Down Expand Up @@ -1578,7 +1600,11 @@ trait Implicits:
validateOrdering(ord)
throw ex

rank(sort(eligible), NoMatchingImplicitsFailure, Nil)
val result = rank(sort(eligible), NoMatchingImplicitsFailure, Nil)
for (ref1, ref2, msg) <- priorityChangeWarnings do
if result.found.exists(ref => ref == ref1 || ref == ref2) then
report.warning(msg, srcPos)
result
end searchImplicit

def isUnderSpecifiedArgument(tp: Type): Boolean =
Expand Down
3 changes: 3 additions & 0 deletions tests/pos/i20484.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
given Int = ???
given Char = ???
val a = summon[Int]
2 changes: 1 addition & 1 deletion tests/semanticdb/expect/InventedNames.expect.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ given [T/*<-givens::InventedNames$package.given_Z_T#[T]*/]: Z/*->givens::Z#*/[T/

val a/*<-givens::InventedNames$package.a.*/ = intValue/*->givens::InventedNames$package.intValue.*/
val b/*<-givens::InventedNames$package.b.*/ = given_String/*->givens::InventedNames$package.given_String.*/
//val c = given_Double
val c/*<-givens::InventedNames$package.c.*/ = given_Double/*->givens::InventedNames$package.given_Double().*/
val d/*<-givens::InventedNames$package.d.*/ = given_List_T/*->givens::InventedNames$package.given_List_T().*/[Int/*->scala::Int#*/]
val e/*<-givens::InventedNames$package.e.*/ = given_Char/*->givens::InventedNames$package.given_Char.*/
val f/*<-givens::InventedNames$package.f.*/ = given_Float/*->givens::InventedNames$package.given_Float.*/
Expand Down
2 changes: 1 addition & 1 deletion tests/semanticdb/expect/InventedNames.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ given [T]: Z[T] with

val a = intValue
val b = given_String
//val c = given_Double
val c = given_Double
val d = given_List_T[Int]
val e = given_Char
val f = given_Float
Expand Down
12 changes: 8 additions & 4 deletions tests/semanticdb/metac.expect
Original file line number Diff line number Diff line change
Expand Up @@ -2093,15 +2093,16 @@ Schema => SemanticDB v4
Uri => InventedNames.scala
Text => empty
Language => Scala
Symbols => 44 entries
Occurrences => 64 entries
Synthetics => 2 entries
Symbols => 45 entries
Occurrences => 66 entries
Synthetics => 3 entries

Symbols:
givens/InventedNames$package. => final package object givens extends Object { self: givens.type => +23 decls }
givens/InventedNames$package. => final package object givens extends Object { self: givens.type => +24 decls }
givens/InventedNames$package.`* *`. => final implicit lazy val given method * * Long
givens/InventedNames$package.a. => val method a Int
givens/InventedNames$package.b. => val method b String
givens/InventedNames$package.c. => val method c Double
givens/InventedNames$package.d. => val method d List[Int]
givens/InventedNames$package.e. => val method e Char
givens/InventedNames$package.f. => val method f Float
Expand Down Expand Up @@ -2192,6 +2193,8 @@ Occurrences:
[32:8..32:16): intValue -> givens/InventedNames$package.intValue.
[33:4..33:5): b <- givens/InventedNames$package.b.
[33:8..33:20): given_String -> givens/InventedNames$package.given_String.
[34:4..34:5): c <- givens/InventedNames$package.c.
[34:8..34:20): given_Double -> givens/InventedNames$package.given_Double().
[35:4..35:5): d <- givens/InventedNames$package.d.
[35:8..35:20): given_List_T -> givens/InventedNames$package.given_List_T().
[35:21..35:24): Int -> scala/Int#
Expand All @@ -2211,6 +2214,7 @@ Occurrences:

Synthetics:
[24:0..24:0): => *(x$1)
[34:8..34:20):given_Double => *(intValue)
[40:8..40:15):given_Y => *(given_X)

expect/Issue1749.scala
Expand Down

0 comments on commit 6e86ada

Please sign in to comment.