diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-12-05 10:45:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 10:45:09 +0100 |
| commit | 2787b47396013a44072fa7321482103b66fbccd3 (patch) | |
| tree | a047943567adc5bb10182d9c0c27034f73f23e29 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | ee1c02b374a4b8a053e9a8b14af5e205afa67e14 (diff) | |
| parent | 7bf8ffa155ba66311a904c7eeaca79a70aa7e6f7 (diff) | |
| download | scala-2787b47396013a44072fa7321482103b66fbccd3.tar.gz scala-2787b47396013a44072fa7321482103b66fbccd3.tar.bz2 scala-2787b47396013a44072fa7321482103b66fbccd3.zip | |
Merge pull request #5570 from adriaanm/t10075
SI-10075 propagate annotations to lazy val's underlying field
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
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 ec676c30a5..fc0a0368ab 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2027,7 +2027,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper // allow trait accessors: it's the only vehicle we have to hang on to annotations that must be passed down to // the field that's mixed into a subclass - if (sym.hasAnnotation(definitions.VolatileAttr) && !((sym hasFlag MUTABLE) || (sym hasFlag ACCESSOR) && sym.owner.isTrait)) + if (sym.hasAnnotation(definitions.VolatileAttr) && !((sym hasFlag MUTABLE | LAZY) || (sym hasFlag ACCESSOR) && sym.owner.isTrait)) VolatileValueError(vdef) val rhs1 = |