fixed bug 581

2 files changed, 1 insertions, 22 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
index 2f80216dbe..fc3aaacaef 100644
--- a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
+++ b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
@@ -103,8 +103,8 @@ abstract class OverridingPairs {
 	  } while (nextEntry != null &&
 		   ((nextEntry.sym hasFlag PRIVATE) ||
 		    (overriding.owner == nextEntry.sym.owner) ||
-		    (hasCommonParent(overriding, nextEntry.sym)) ||
 		    (!matches(overriding, nextEntry.sym)) ||
+		    (hasCommonParent(overriding, nextEntry.sym)) ||
 		    (overriding hasFlag LOCAL)))
 	}
 	if (nextEntry != null) {
diff --git a/test/pending/pos/bug577.scala b/test/pending/pos/bug577.scala
deleted file mode 100644
index ede45399a0..0000000000
--- a/test/pending/pos/bug577.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-trait PriorityTree {
-  type Node <: BasicTreeNode;
-
-  val top = initTree;
-  top.next = (initTree);
-  top.next.prev = (top);
-
-  def initTree : Node;
-
-
-
-
-  trait BasicTreeNode {
-    private[PriorityTree] var next  : Node = _;
-    private[PriorityTree] var prev  : Node = _;
-    private[PriorityTree] var chld : Node = _;
-    //var next  : Node = _;
-    //var prev  : Node = _;
-    //var chld : Node = _;
-  }
-}