Merge pull request #8900 from som-snytt/review/8558

scala · Apr 21, 2020 · 51233da · 51233da
2 parents 62aac17 + 2c61430
commit 51233da
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -4694,7 +4694,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
 
         def shadowsSetter =
           lhs1 match {
-            case treeInfo.Applied(Select(qual, _), _, _) =>
+            case treeInfo.Applied(Select(qual, _), _, _) if qual.isTyped =>
               qual.tpe.member(varsym.name.setterName).exists
             case _ => false
           }
@@ -4726,10 +4726,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
           }
           wrapErrors(t, _.typed1(t, mode, pt))
         }
-        else if (shadowsSetter) {
-          val res = setterRewrite
-          if (!res.isEmpty) res else fail()
-        }
+        else if (shadowsSetter) setterRewrite orElse fail()
         else fail()
       }
 

diff --git a/test/files/neg/t3194.check b/test/files/neg/t3194.check
@@ -0,0 +1,4 @@
+t3194.scala:3: error: value z is not a member of object Nil
+  def zero(): Unit = Nil.z = 0
+                         ^
+1 error
diff --git a/test/files/neg/t3194.scala b/test/files/neg/t3194.scala
@@ -0,0 +1,4 @@
+
+trait T {
+  def zero(): Unit = Nil.z = 0
+}