diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 943098fe62..58146ffd80 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1511,8 +1511,12 @@ 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") + if (sym.hasAnnotation(definitions.VolatileAttr)) { + if (!sym.hasFlag(MUTABLE)) + error(vdef.pos, "values cannot be volatile") + else if (sym.hasFlag(FINAL)) + error(vdef.pos, "final vars cannot be volatile") + } val rhs1 = if (vdef.rhs.isEmpty) { if (sym.isVariable && sym.owner.isTerm && phase.id <= currentRun.typerPhase.id) |