fixed problem with protected

1 files changed, 3 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 5ae728448b..2e4742e94c 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -294,14 +294,13 @@ trait Contexts requires Analyzer {
            " " + scope.toList + "\n:: " + outer.toString()
     }
 
-    private def moduleToLinkedClass(sym: Symbol) =
-      if (sym.isModuleClass) sym.linkedClassOfModule else sym
-
     /** Return closest enclosing context that defines a superclass of `clazz', or a
      *  companion module of a superclass of `clazz', or NoContext if none exists */
     def enclosingSuperClassContext(clazz: Symbol): Context = {
       var c = this.enclClass
-      while (c != NoContext && !clazz.isNonBottomSubClass(moduleToLinkedClass(c.owner)))
+      while (c != NoContext &&
+             !clazz.isNonBottomSubClass(c.owner) &&
+             !(c.owner.isModuleClass && clazz.isNonBottomSubClass(c.owner.linkedClassOfModule)))
         c = c.outer.enclClass
       c
     }