diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-28 09:38:34 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-28 09:38:34 +0200 |
| commit | d8da39a197a9a4405806128bba49ad706677896b (patch) | |
| tree | 78b85bde53a8fbf5b28efd0d1f718ed236923dcf /src/compiler | |
| parent | 2279d3f3d94b3b870a2620f47ac7b7e17e35c830 (diff) | |
| parent | 0c99742c51706ee4b60a56a8f5babb13682f9b10 (diff) | |
| download | scala-d8da39a197a9a4405806128bba49ad706677896b.tar.gz scala-d8da39a197a9a4405806128bba49ad706677896b.tar.bz2 scala-d8da39a197a9a4405806128bba49ad706677896b.zip | |
Merge pull request #4661 from retronym/ticket/9365
SI-9365 Don't null out dependencies of transient lazy vals
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 25d45cc819..a079a76ce7 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -1122,7 +1122,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { if (scope exists (_.isLazy)) { val map = mutable.Map[Symbol, Set[Symbol]]() withDefaultValue Set() // check what fields can be nulled for - for ((field, users) <- singleUseFields(templ); lazyFld <- users) + for ((field, users) <- singleUseFields(templ); lazyFld <- users if !lazyFld.accessed.hasAnnotation(TransientAttr)) map(lazyFld) += field map.toMap |