Fix rebase breakage

Author: odersky

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

@@ -2591,6 +2591,11 @@ object TypeComparer {
   def provablyDisjoint(tp1: Type, tp2: Type)(using Context): Boolean =
     comparing(_.provablyDisjoint(tp1, tp2))
 
+  def liftIfHK(tp1: Type, tp2: Type,
+      op: (Type, Type) => Type, original: (Type, Type) => Type,
+      combineVariance: (Variance, Variance) => Variance)(using Context): Type =
+    comparing(_.liftIfHK(tp1, tp2, op, original, combineVariance))
+
   def constValue(tp: Type)(using Context): Option[Constant] =
     comparing(_.constValue(tp))
 

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

@@ -2948,7 +2948,7 @@ object Types {
 
     /** Like `make`, but also supports higher-kinded types as argument */
     def makeHk(tp1: Type, tp2: Type)(using Context): Type =
-      ctx.typeComparer.liftIfHK(tp1, tp2, AndType.make(_, _, checkValid = false), makeHk, _ | _)
+      TypeComparer.liftIfHK(tp1, tp2, AndType.make(_, _, checkValid = false), makeHk, _ | _)
   }
 
   abstract case class OrType(tp1: Type, tp2: Type) extends AndOrType {
@@ -3038,7 +3038,7 @@ object Types {
 
     /** Like `make`, but also supports higher-kinded types as argument */
     def makeHk(tp1: Type, tp2: Type)(using Context): Type =
-      ctx.typeComparer.liftIfHK(tp1, tp2, OrType(_, _), makeHk, _ & _)
+      TypeComparer.liftIfHK(tp1, tp2, OrType(_, _), makeHk, _ & _)
   }
 
   /** An extractor object to pattern match against a nullable union.