summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2009-09-04 16:46:58 +0000
committerIulian Dragos <jaguarul@gmail.com>2009-09-04 16:46:58 +0000
commit17a441d93a14c578a1a84ea0f3f9bd090ba26fb8 (patch)
tree87b02859996f69499d3ee5622baabcd4a81d4b18 /src
parentf8f0e5d25a76057ef3e7470e1eb44c5083206016 (diff)
downloadscala-17a441d93a14c578a1a84ea0f3f9bd090ba26fb8.tar.gz
scala-17a441d93a14c578a1a84ea0f3f9bd090ba26fb8.tar.bz2
scala-17a441d93a14c578a1a84ea0f3f9bd090ba26fb8.zip
Fixed #2095.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 372f8965e4..59b345dd6f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1392,6 +1392,8 @@ trait Typers { self: Analyzer =>
var tpt1 = checkNoEscaping.privates(sym, typer1.typedType(vdef.tpt))
checkNonCyclic(vdef, tpt1)
+ if (sym.hasAnnotation(definitions.VolatileAttr) && !sym.hasFlag(MUTABLE))
+ error(vdef.pos, "values cannot be volatile")
val rhs1 =
if (vdef.rhs.isEmpty) {
if (sym.isVariable && sym.owner.isTerm && phase.id <= currentRun.typerPhase.id)