WIP

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

@@ -456,6 +456,11 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
       // skip this member
       return NoSymbol
 
+    // Adapt the flags of getters so they become like vals/vars instead
+    if flags.isAllOf(Method | Accessor) && !name.toString().endsWith("_$eq") then
+      flags &~= Method | Accessor
+      if !flags.is(StableRealizable) then flags |= Mutable
+
     name = name.adjustIfModuleClass(flags)
     if (flags.is(Method))
       name =
@@ -620,7 +625,12 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
             setClassInfo(denot, tp, fromScala2 = true, selfInfo)
             NamerOps.addConstructorProxies(denot.classSymbol)
           case denot =>
-            val tp1 = translateTempPoly(tp)
+            val tp0 = translateTempPoly(tp)
+            val tp1 =
+              if !denot.is(Param) && !denot.is(Method) && tp0.isInstanceOf[ExprType] then
+                tp0.asInstanceOf[ExprType].resultType
+              else tp0
+
             denot.info =
               if (tag == ALIASsym) TypeAlias(tp1)
               else if (denot.isType) checkNonCyclic(denot.symbol, tp1, reportErrors = false)

tests/neg/constructor-proxy-shadowing.check

@@ -52,7 +52,7 @@
 17 |val x = Seq(3) // error: shadowing
    |        ^^^
    |        Reference to constructor proxy for class Seq
-   |        shadows outer reference to getter Seq in package scala
+   |        shadows outer reference to value Seq in package scala
    |
    |        The instance needs to be created with an explicit `new`.
    |--------------------------------------------------------------------------------------------------------------------
@@ -66,7 +66,7 @@
    |
    |    new Seq(...)
    |
-   | Or it could mean calling the apply method of getter Seq in package scala as in
+   | Or it could mean calling the apply method of value Seq in package scala as in
    |
    |    Seq.apply(...)
    |