Remove the added flag

Author: jchyb

compiler/src/dotty/tools/dotc/ast/untpd.scala

@@ -210,7 +210,7 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
 
     case class Given()(implicit @constructorOnly src: SourceFile) extends Mod(Flags.Given)
 
-    case class GivenFromImplicit()(implicit @constructorOnly src: SourceFile) extends Mod(Flags.Given | Flags.FromImplicit)
+    case class GivenFromImplicit()(implicit @constructorOnly src: SourceFile) extends Mod(Flags.Given)
 
     case class Erased()(implicit @constructorOnly src: SourceFile) extends Mod(Flags.Erased)
 

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

@@ -63,7 +63,7 @@ object NamerOps:
     if !isConstructor then paramss
     else paramss match
       case TypeSymbols(tparams) :: paramss1 => tparams :: normalizeIfConstructor(paramss1, isConstructor)
-      case TermSymbols(vparam :: _) :: _ if vparam.is(Implicit) || vparam.is(FromImplicit) => Nil :: paramss
+      case TermSymbols(vparam :: _) :: _ if vparam.is(Implicit) || vparam.isGivenFromImplicit => Nil :: paramss
       case _ =>
         if paramss.forall {
           case TermSymbols(vparams) => vparams.nonEmpty && vparams.head.is(Given)
@@ -80,7 +80,7 @@ object NamerOps:
       case TermSymbols(params) :: paramss1 =>
         val (isContextual, isImplicit, fromImplicit) =
           if params.isEmpty then (false, false, false)
-          else (params.head.is(Given), params.head.is(Implicit), params.head.is(FromImplicit))
+          else (params.head.is(Given), params.head.is(Implicit), params.head.isGivenFromImplicit)
         val make = MethodType.companion(isContextual = isContextual, isImplicit = isImplicit, fromImplicit = fromImplicit)
         if isJava then
           for param <- params do

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

@@ -392,6 +392,14 @@ object Symbols extends SymUtils {
     def paramVariance(using Context): Variance = denot.variance
     def paramRef(using Context): TypeRef = denot.typeRef
 
+    /** Was it an implicit, changed into a given with `-Yimplicit-as-given` */
+    def isGivenFromImplicit(using Context): Boolean =
+      ctx.settings.YimplicitAsGiven.value && (
+        defTree match
+          case defTree: DefTree => defTree.mods.mods.exists(_.isInstanceOf[untpd.Mod.GivenFromImplicit])
+          case _ => false
+      )
+
     /** Copy a symbol, overriding selective fields.
      *  Note that `coord` and `compilationUnitInfo` will be set from the fields in `owner`, not
      *  the fields in `sym`. */