Add property IsInSuperCall to context

Author: liufengyun

compiler/src/dotty/tools/dotc/transform/init/ParamOverridingCheck.scala

@@ -8,10 +8,11 @@ import Symbols.*
 import Types.*
 import StdNames.*
 import NameKinds.OuterSelectName
+import util.Property
 
 import ast.tpd.*
 import config.Printers.init as printer
-import reporting.trace as log
+import reporting.trace.force as log
 
 import Semantic.Arg
 import Semantic.NewExpr
@@ -46,6 +47,8 @@ import scala.annotation.tailrec
 object ParamOverridingCheck:
   type Contextual[T] = Context ?=> T
 
+  private val IsInSuperCall = new Property.Key[Boolean]
+
   // ----------------------- Domain definitions --------------------------------
 
   sealed abstract class Value:
@@ -81,7 +84,12 @@ object ParamOverridingCheck:
     def select(field: Symbol, receiver: Type, needResolve: Boolean = true, source: Tree): Contextual[Value] = log("select " + field.show + ", this = " + value, printer) {
       value match
         case ref: ThisRef =>
-          val target = if needResolve then Semantic.resolve(ref.klass, field) else field
+          val target =
+            if needResolve && !ctx.property(IsInSuperCall).nonEmpty then
+              Semantic.resolve(ref.klass, field)
+            else
+              field
+
           if target.is(Flags.Lazy) then
             val rhs = target.defTree.asInstanceOf[ValDef].rhs
             eval(rhs, ref, target.owner.asClass)
@@ -256,11 +264,13 @@ object ParamOverridingCheck:
     def initParent(parent: Tree) =
       parent match
       case tree @ Block(stats, NewExpr(tref, New(tpt), ctor, argss)) =>  // can happen
-        val args = evalArgs(argss.flatten, thisV, klass)
+        val ctx2 = ctx.withProperty(IsInSuperCall, Some(true))
+        val args = evalArgs(argss.flatten, thisV, klass)(using ctx2)
         superCall(tref, ctor, args)
 
       case tree @ NewExpr(tref, New(tpt), ctor, argss) =>       // extends A(args)
-        val args = evalArgs(argss.flatten, thisV, klass)
+        val ctx2 = ctx.withProperty(IsInSuperCall, Some(true))
+        val args = evalArgs(argss.flatten, thisV, klass)(using ctx2)
         superCall(tref, ctor, args)
 
       case _ =>   // extends A or extends A[T]
@@ -314,13 +324,13 @@ object ParamOverridingCheck:
     do
       // println(paramSym.show + " is overridden in " + thisV.klass)
       if !overridingSym.is(Flags.ParamAccessor) then
-        report.warning("Overriding parameter " + paramSym.show + " in " + klass + " as non-parameter in " + thisV.klass, overridingSym.defTree)
+        report.warning("Overriding parameter " + paramSym.show + " in " + klass.show + " as non-parameter in " + thisV.klass.show, overridingSym.defTree)
       else
         val overridingValue = thisV.field(overridingSym)
         // println(overridingSym.show + " in " + thisV.klass + " = " + overridingValue)
         // println(paramSym.show + " in " + klass + " = " + thisV.field(paramSym))
         if thisV.field(paramSym) != overridingValue then
-          report.warning("Incorrect overriding: " + paramSym.show + " in " + klass + " have different value from " + overridingSym.show + " in " + thisV.klass, overridingValue.source)
+          report.warning("Incorrect overriding: " + paramSym.show + " in " + klass.show + " has a different value from " + overridingSym.show + " in " + thisV.klass.show, overridingValue.source)
 
     thisV
   }