Avoid overwriting type var instance in instantiateWith

This is a trial as a first step for other refactorings down the line.

Author: odersky

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

@@ -4910,20 +4910,21 @@ object Types extends TypeUtils {
     def isInstantiated(using Context): Boolean = instanceOpt.exists
 
     /** Instantiate variable with given type */
-    def instantiateWith(tp: Type)(using Context): Type = {
-      assert(tp ne this, i"self instantiation of $origin, constraint = ${ctx.typerState.constraint}")
-      assert(!myInst.exists, i"$origin is already instantiated to $myInst but we attempted to instantiate it to $tp")
-      typr.println(i"instantiating $this with $tp")
+    def instantiateWith(tp: Type)(using Context): Type =
+      if myInst.exists then myInst
+      else
+        assert(tp ne this, i"self instantiation of $origin, constraint = ${ctx.typerState.constraint}")
+        assert(!myInst.exists, i"$origin is already instantiated to $myInst but we attempted to instantiate it to $tp")
+        typr.println(i"instantiating $this with $tp")
 
-      if Config.checkConstraintsSatisfiable then
-        assert(currentEntry.bounds.contains(tp),
-          i"$origin is constrained to be $currentEntry but attempted to instantiate it to $tp")
+        if Config.checkConstraintsSatisfiable then
+          assert(currentEntry.bounds.contains(tp),
+            i"$origin is constrained to be $currentEntry but attempted to instantiate it to $tp")
 
-      if ((ctx.typerState eq owningState.nn.get.uncheckedNN) && !TypeComparer.subtypeCheckInProgress)
-        setInst(tp)
-      ctx.typerState.constraint = ctx.typerState.constraint.replace(origin, tp)
-      tp
-    }
+        if ((ctx.typerState eq owningState.nn.get.uncheckedNN) && !TypeComparer.subtypeCheckInProgress)
+          setInst(tp)
+        ctx.typerState.constraint = ctx.typerState.constraint.replace(origin, tp)
+        tp
 
     def typeToInstantiateWith(fromBelow: Boolean)(using Context): Type =
       TypeComparer.instanceType(origin, fromBelow, widenUnions, nestingLevel)
@@ -4937,10 +4938,7 @@ object Types extends TypeUtils {
      */
     def instantiate(fromBelow: Boolean)(using Context): Type =
       val tp = typeToInstantiateWith(fromBelow)
-      if myInst.exists then // The line above might have triggered instantiation of the current type variable
-        myInst
-      else
-        instantiateWith(tp)
+      instantiateWith(tp)
 
     /** Widen unions when instantiating this variable in the current context? */
     def widenUnions(using Context): Boolean = !ctx.typerState.constraint.isHard(this)

tests/neg/showtest.scala

@@ -0,0 +1,10 @@
+trait Show[T]:
+  extension (x: T) def show: String
+
+given showAnx: Show[Any] = _.toString
+
+def print[T: Show](x: T) = println(x.show)
+
+@main def Test =
+  println("hello".show) // ok
+  print("hello".show) // error

tests/pos/showtest.scala

@@ -0,0 +1,13 @@
+trait Show[T]:
+  extension (x: T) def show: String
+
+given showAny[T]: Show[T] = _.toString
+given showInt: Show[Int] = x => s"INT $x"
+
+def print[T: Show](x: T) = println(x.show)
+
+@main def Test =
+  println("hello".show)
+  println(1.show)
+  print("hello".show)
+  print(1)