diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-06-30 01:45:47 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-07-02 13:21:32 +0200 |
| commit | 96dd73146f4317feeb59a242d692977f87c5211d (patch) | |
| tree | b659995dc470be408db317771d147d1035826384 /src/compiler/scala/reflect/reify/codegen/GenTypes.scala | |
| parent | c18414d6e1ba89882ba57266bfe96d85fb57713f (diff) | |
| download | scala-96dd73146f4317feeb59a242d692977f87c5211d.tar.gz scala-96dd73146f4317feeb59a242d692977f87c5211d.tar.bz2 scala-96dd73146f4317feeb59a242d692977f87c5211d.zip | |
reify no longer dealiases symbols and types
this uncovers a bug in toolboxes: https://issues.scala-lang.org/browse/SI-6007
however that bug is not critical, so it will be dealt with later
Diffstat (limited to 'src/compiler/scala/reflect/reify/codegen/GenTypes.scala')
| -rw-r--r-- | src/compiler/scala/reflect/reify/codegen/GenTypes.scala | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/compiler/scala/reflect/reify/codegen/GenTypes.scala b/src/compiler/scala/reflect/reify/codegen/GenTypes.scala index f7239f9c67..82951a2434 100644 --- a/src/compiler/scala/reflect/reify/codegen/GenTypes.scala +++ b/src/compiler/scala/reflect/reify/codegen/GenTypes.scala @@ -11,9 +11,8 @@ trait GenTypes { * Reify a type. * For internal use only, use ``reified'' instead. */ - def reifyType(tpe0: Type): Tree = { - assert(tpe0 != null, "tpe is null") - val tpe = tpe0.dealias + def reifyType(tpe: Type): Tree = { + assert(tpe != null, "tpe is null") if (tpe.isErroneous) CannotReifyErroneousReifee(tpe) @@ -29,9 +28,9 @@ trait GenTypes { if (spliced != EmptyTree) return spliced - val tsym = tpe.typeSymbol + val tsym = tpe.typeSymbolDirect if (tsym.isClass && tpe == tsym.typeConstructor && tsym.isStatic) - Select(Select(reify(tpe.typeSymbol), nme.asTypeSymbol), nme.asTypeConstructor) + Select(Select(reify(tsym), nme.asTypeSymbol), nme.asTypeConstructor) else tpe match { case tpe @ NoType => reifyMirrorObject(tpe) |