summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-03-10 10:06:00 +0100
committerJason Zaugg <jzaugg@gmail.com>2013-03-10 10:11:25 +0100
commit41e3b89c6d636164f48a2c2d8e8867201075cdae (patch)
tree4ec15eb837f9498676210622a246980f8643fa4c /src/compiler
parent33b499cd04342a49bd5c4f5bf0e2fab88b69069c (diff)
downloadscala-41e3b89c6d636164f48a2c2d8e8867201075cdae.tar.gz
scala-41e3b89c6d636164f48a2c2d8e8867201075cdae.tar.bz2
scala-41e3b89c6d636164f48a2c2d8e8867201075cdae.zip
SI-7233 Account for aliased imports in Erasure
When we discard the fiction of `scala.Any`.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/transform/Erasure.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala
index cb5268c422..ead6ef288c 100644
--- a/src/compiler/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
@@ -781,7 +781,7 @@ abstract class Erasure extends AddInterfaces
else if (tree.symbol == Any_isInstanceOf)
adaptMember(atPos(tree.pos)(Select(qual, Object_isInstanceOf)))
else if (tree.symbol.owner == AnyClass)
- adaptMember(atPos(tree.pos)(Select(qual, getMember(ObjectClass, name))))
+ adaptMember(atPos(tree.pos)(Select(qual, getMember(ObjectClass, tree.symbol.name))))
else {
var qual1 = typedQualifier(qual)
if ((isPrimitiveValueType(qual1.tpe) && !isPrimitiveValueMember(tree.symbol)) ||