Fix regression in cyclic constraint handling (#16514)

This regressed in 50eb0e9 when
`current.ensureNonCyclic` was incorrectly replaced by `validBoundsFor`
which operates on `this`, not `current`.

This isn't the first time we make this error (cf
a8641c5), maybe we should refactor
OrderingConstraint so that operations on `current` are done in the
companion object where `this` isn't accessible.

Fixes #16471. Note that the test case from this issue couldn't be added
because it fails `-Ycheck:typer`, but this was also the case before the
regression. This is now tracked by #16524.

Author: odersky

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

@@ -693,7 +693,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
       def replaceParamIn(other: TypeParamRef) =
         val oldEntry = current.entry(other)
         val newEntry = oldEntry.substParam(param, replacement) match
-          case tp: TypeBounds => validBoundsFor(other, tp)
+          case tp: TypeBounds => current.validBoundsFor(other, tp)
           case tp => tp
         current = boundsLens.update(this, current, other, newEntry)
         var oldDepEntry = oldEntry

compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala

@@ -77,3 +77,17 @@ class ConstraintsTest:
       assert(lo =:= defn.NothingType, i"Unexpected lower bound $lo for $t: ${ctx.typerState.constraint}")
       assert(hi =:= (defn.StringType | defn.IntType), i"Unexpected upper bound $hi for $t: ${ctx.typerState.constraint}")
   }
+
+  @Test def validBoundsReplace: Unit = inCompilerContext(
+    TestConfiguration.basicClasspath,
+    scalaSources = "trait X; trait A { def foo[S <: U | X, T, U]: Any }") {
+      val tvarTrees = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda], EmptyTree, alwaysAddTypeVars = true)._2
+      val tvars @ List(s, t, u) = tvarTrees.tpes.asInstanceOf[List[TypeVar]]
+      s =:= t
+      t =:= u
+
+      for tvar <- tvars do
+        val entry = ctx.typerState.constraint.entry(tvar.origin)
+        assert(!ctx.typerState.constraint.occursAtToplevel(tvar.origin, entry),
+          i"cyclic bound for ${tvar.origin}: ${entry} in ${ctx.typerState.constraint}")
+  }