Handle paths extending SharableCapablity

This partially reverts commit 7b3d3f4.

Author: odersky

compiler/src/dotty/tools/dotc/cc/CaptureOps.scala

@@ -281,20 +281,10 @@ extension (tp: Type)
 
   /** The first element of this path type */
   final def pathRoot(using Context): Type = tp.dealias match
-    case tp1: TermRef if tp1.symbol.maybeOwner.isClass => tp1.prefix.pathRoot
-    case tp1: TypeRef if !tp1.symbol.is(Param) => tp1.prefix.pathRoot
+    case tp1: NamedType if tp1.symbol.maybeOwner.isClass && !tp1.symbol.is(TypeParam) =>
+      tp1.prefix.pathRoot
     case tp1 => tp1
 
-  /** The first element of a path type, but stop at references extending
-   *  SharableCapability
-   */
-  final def pathRootOrShared(using Context): Type =
-    if tp.derivesFrom(defn.Caps_SharedCapability) then tp
-    else tp.dealias match
-      case tp1: TermRef if tp1.symbol.maybeOwner.isClass => tp1.prefix.pathRoot
-      case tp1: TypeRef if !tp1.symbol.is(Param) => tp1.prefix.pathRoot
-      case tp1 => tp1
-
   /** If this part starts with `C.this`, the class `C`.
    *  Otherwise, if it starts with a reference `r`, `r`'s owner.
    *  Otherwise NoSymbol.

compiler/src/dotty/tools/dotc/cc/SepCheck.scala

@@ -410,9 +410,8 @@ class SepChecker(checker: CheckCaptures.CheckerAPI) extends tpd.TreeTraverser:
     val badParams = mutable.ListBuffer[Symbol]()
     def currentOwner = role.dclSym.orElse(ctx.owner)
     for hiddenRef <- prune(refsToCheck, tpe, role) do
-      val proot = hiddenRef.pathRootOrShared
-      if !proot.widen.derivesFrom(defn.Caps_SharedCapability) then
-        proot match
+      if !hiddenRef.derivesFrom(defn.Caps_SharedCapability) then
+        hiddenRef.pathRoot match
           case ref: TermRef =>
             val refSym = ref.symbol
             if currentOwner.enclosingMethodOrClass.isProperlyContainedIn(refSym.maybeOwner.enclosingMethodOrClass) then
@@ -448,7 +447,7 @@ class SepChecker(checker: CheckCaptures.CheckerAPI) extends tpd.TreeTraverser:
     role match
       case _: TypeRole.Argument | _: TypeRole.Qualifier =>
         for ref <- refsToCheck do
-          if !ref.pathRootOrShared.derivesFrom(defn.Caps_SharedCapability) then
+          if !ref.derivesFrom(defn.Caps_SharedCapability) then
             consumed.put(ref, pos)
       case _ =>
   end checkConsumedRefs