diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-05-26 10:41:04 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-05-26 10:41:04 -0700 |
commit | 7b224c57c2712994c043c749028cb2589155358f (patch) | |
tree | e2c7ad8517508e2f99b0f5fdab915a248d5a34a1 /src | |
parent | ba81cf068c36cceaaf49ccbdbb86a45dc3b3a40f (diff) | |
parent | bd42db9e344e317a8cd83097d5278d915cfa0f0f (diff) | |
download | scala-7b224c57c2712994c043c749028cb2589155358f.tar.gz scala-7b224c57c2712994c043c749028cb2589155358f.tar.bz2 scala-7b224c57c2712994c043c749028cb2589155358f.zip |
Merge pull request #4521 from retronym/ticket/9326
SI-9326 Fix regression with existentials in parent types
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index d5a3fba76f..7c931600e5 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -952,11 +952,18 @@ trait Contexts { self: Analyzer => private def importedAccessibleSymbol(imp: ImportInfo, name: Name, requireExplicit: Boolean): Symbol = imp.importedSymbol(name, requireExplicit) filter (s => isAccessible(s, imp.qual.tpe, superAccess = false)) + private def requiresQualifier(s: Symbol) = ( + s.owner.isClass + && !s.owner.isPackageClass + && !s.isTypeParameterOrSkolem + && !s.isExistentiallyBound + ) + /** Must `sym` defined in package object of package `pkg`, if * it selected from a prefix with `pkg` as its type symbol? */ def isInPackageObject(sym: Symbol, pkg: Symbol): Boolean = - pkg.isPackage && sym.owner != pkg + pkg.isPackage && sym.owner != pkg && requiresQualifier(sym) def isNameInScope(name: Name) = lookupSymbol(name, _ => true).isSuccess @@ -992,11 +999,6 @@ trait Contexts { self: Analyzer => || unit.exists && s.sourceFile != unit.source.file ) ) - def requiresQualifier(s: Symbol) = ( - s.owner.isClass - && !s.owner.isPackageClass - && !s.isTypeParameterOrSkolem - ) def lookupInPrefix(name: Name) = pre member name filter qualifies def accessibleInPrefix(s: Symbol) = isAccessible(s, pre, superAccess = false) |