summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-07-08 14:51:12 +0200
committerJason Zaugg <jzaugg@gmail.com>2012-07-08 16:30:10 +0200
commitda587e31782ecbad27bd9d9247100b3ac1827b11 (patch)
tree8518630f7058f3a0387bb0ecdcb63fb23d85ac8d /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parentf2dbe673756302d5f5824fd8d0e6e3b3eb45a57b (diff)
downloadscala-da587e31782ecbad27bd9d9247100b3ac1827b11.tar.gz
scala-da587e31782ecbad27bd9d9247100b3ac1827b11.tar.bz2
scala-da587e31782ecbad27bd9d9247100b3ac1827b11.zip
SI-6042 Improve type selection from volatile type error
- Display the type of the typed qualifier (qual1), to avoid the message "Illegal type selection from volatile type null". - Show the upper bound, which is used to calculate the volatility.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index ccd346e72d..20241953c1 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -5114,7 +5114,7 @@ trait Typers extends Modes with Adaptations with Tags {
case SelectFromTypeTree(qual, selector) =>
val qual1 = typedType(qual, mode)
- if (qual1.tpe.isVolatile) TypeSelectionFromVolatileTypeError(tree, qual)
+ if (qual1.tpe.isVolatile) TypeSelectionFromVolatileTypeError(tree, qual1)
else typedSelect(qual1, selector)
case CompoundTypeTree(templ) =>