summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-07-29 07:16:23 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-07-29 07:16:23 -0700
commite95691996d3df58499491db6c5b6d386b64cefdc (patch)
treed5aca3dfa840e452e0f74a2026e68d59e0afbdcc /src/reflect
parent9cf4dd6bbeccc6a1ec2e8dbdbcf9aaa59b5bf91f (diff)
parentcf709c2dd23b7f1f659e52bcb8beb098c5d02d50 (diff)
downloadscala-e95691996d3df58499491db6c5b6d386b64cefdc.tar.gz
scala-e95691996d3df58499491db6c5b6d386b64cefdc.tar.bz2
scala-e95691996d3df58499491db6c5b6d386b64cefdc.zip
Merge pull request #988 from paulp/issue/4560
Issue/4560
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/Types.scala8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala
index 14a9fe6701..3a218c18f1 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`.