diff options
| author | Johannes Rudolph <johannes_rudolph@gmx.de> | 2012-07-22 10:55:45 +0200 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-07-24 20:51:38 -0700 |
| commit | c8bdf199476fdd113d28b23793b5e871390cf825 (patch) | |
| tree | dd750e08ce4d6bec85e679af00fbddfb77d90561 | |
| parent | 097e5690e543aacde7228e70388e5d6dfa6a721c (diff) | |
| download | scala-c8bdf199476fdd113d28b23793b5e871390cf825.tar.gz scala-c8bdf199476fdd113d28b23793b5e871390cf825.tar.bz2 scala-c8bdf199476fdd113d28b23793b5e871390cf825.zip | |
Revert "tentative fix for RC5 lift build problem."
This reverts commit cb4fd65825f3c88908103e48d0d7e89d70d26c22.
Conflicts:
src/compiler/scala/tools/nsc/symtab/Types.scala
src/compiler/scala/tools/nsc/typechecker/Contexts.scala
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 1 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 805f60ba87..0fc298e886 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -552,7 +552,6 @@ trait Contexts { self: Analyzer => ( (ab.isTerm || ab == rootMirror.RootClass) || (accessWithin(ab) || accessWithinLinked(ab)) && ( !sym.hasLocalFlag - || sym.owner.isImplClass // allow private local accesses to impl classes || sym.isProtected && isSubThisType(pre, sym.owner) || pre =:= sym.owner.thisType ) diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index 01679a777d..21833696a5 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -1392,11 +1392,9 @@ trait Types extends api.Types { self: SymbolTable => final class UniqueThisType(sym: Symbol) extends ThisType(sym) with UniqueType { } object ThisType extends ThisTypeExtractor { - def apply(sym: Symbol): Type = { - if (!phase.erasedTypes) unique(new UniqueThisType(sym)) - else if (sym.isImplClass) sym.typeOfThis - else sym.tpe - } + def apply(sym: Symbol): Type = + if (phase.erasedTypes) sym.tpe + else unique(new UniqueThisType(sym)) } /** A class for singleton types of the form `<prefix>.<sym.name>.type`. |