From 47885ff665a951d2574a7ca5b2ea27c30b67c862 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Wed, 5 Feb 2014 11:42:02 +0100
Subject: SI-7475 Address review comments in FindMembers

  - comment the cases in `isNewMember`
  - check both sides for privacy (doesn't influence behaviour of
    any tests, but it means that method can be understood without
    understanding the order of traversal of members.)
  - hoist `findAll`
  - break out of the loop in `FindMembers` as soon as we determine
    that the candidate member is matched by an already-found member
    and can be discarded.
---
 .../scala/reflect/internal/tpe/FindMembers.scala        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/reflect/scala/reflect/internal/tpe/FindMembers.scala b/src/reflect/scala/reflect/internal/tpe/FindMembers.scala
index 33eccd8bbd..de54f3768e 100644
--- a/src/reflect/scala/reflect/internal/tpe/FindMembers.scala
+++ b/src/reflect/scala/reflect/internal/tpe/FindMembers.scala
@@ -64,12 +64,13 @@ trait FindMembers {
      *
      * Called in two passes: first excluding deferred, then mandating it.
      *
-     * @return true, if a potential deferred member was seen on the first pass that calls for a second pass.
+     * @return if a potential deferred member was seen on the first pass that calls for a second pass,
+               and `excluded & DEFERRED != 0L`
      */
     private def walkBaseClasses(required: Long, excluded: Long): Boolean = {
       var bcs = initBaseClasses
 
-      // Has we seen a candidate deferred member?
+      // Have we seen a candidate deferred member?
       var deferredSeen = false
 
       // All direct parents of refinement classes in the base class sequence
@@ -79,10 +80,11 @@ trait FindMembers {
       // Has the current `walkBaseClasses` encountered a non-refinement class?
       var seenFirstNonRefinementClass = false
 
+      val findAll = name == nme.ANYname
+
       while (!bcs.isEmpty) {
         val currentBaseClass = bcs.head
         val decls = currentBaseClass.info.decls
-        val findAll = name == nme.ANYname
         var entry = if (findAll) decls.elems else decls.lookupEntry(name)
         while (entry ne null) {
           val sym = entry.sym
@@ -150,9 +152,10 @@ trait FindMembers {
     // True unless the already-found member of type `memberType` matches the candidate symbol `other`.
     protected def isNewMember(member: Symbol, other: Symbol): Boolean =
       (    (other ne member)
-        && (    (member.owner eq other.owner)
-             || (member.flags & PRIVATE) != 0
-             || !(memberTypeLow(member) matches memberTypeHi(other))
+        && (    (member.owner eq other.owner)                         // same owner, therefore overload
+             || (member.flags & PRIVATE) != 0                         // (unqualified) private members never participate in overriding
+             || (other.flags & PRIVATE) != 0                          // ... as overrider or overridee.
+             || !(memberTypeLow(member) matches memberTypeHi(other))  // do the member types match? If so, its an override. Otherwise it's an overload.
            )
       )
 
@@ -202,7 +205,7 @@ trait FindMembers {
       val members = membersScope
       var others = members.lookupEntry(sym.name)
       var isNew = true
-      while (others ne null) {
+      while ((others ne null) && isNew) {
         val member = others.sym
         if (!isNewMember(member, sym))
           isNew = false
-- 
cgit v1.2.3