... but keep lazy accessor rhs!

adriaanm · adriaanm · commit 1311b2ceeccf · 2016-04-28T23:22:12.000-07:00
diff --git a/src/compiler/scala/tools/nsc/transform/Constructors.scala b/src/compiler/scala/tools/nsc/transform/Constructors.scala
@@ -661,7 +661,7 @@ abstract class Constructors extends Statics with Transform with ast.TreeDSL {
               }
 
             case dd: DefDef =>
-              def traitMemoizedFieldAccessor = clazz.isTrait && statSym.isAccessor && memoizeValue(statSym.accessed)
+              def traitMemoizedFieldAccessor = clazz.isTrait && statSym.isAccessor && !statSym.isLazy && memoizeValue(statSym.accessed)
 
               if ((dd.rhs eq EmptyTree) || !traitMemoizedFieldAccessor) { defBuf += dd }
               else defBuf += deriveDefDef(stat)(_ => EmptyTree)

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ abstract class Constructors extends Statics with Transform with ast.TreeDSL {`
`661`	`661`	`}`
`662`	`662`
`663`	`663`	`case dd: DefDef =>`
`664`		`- def traitMemoizedFieldAccessor = clazz.isTrait && statSym.isAccessor && memoizeValue(statSym.accessed)`
	`664`	`+ def traitMemoizedFieldAccessor = clazz.isTrait && statSym.isAccessor && !statSym.isLazy && memoizeValue(statSym.accessed)`
`665`	`665`
`666`	`666`	`if ((dd.rhs eq EmptyTree) \|\| !traitMemoizedFieldAccessor) { defBuf += dd }`
`667`	`667`	`else defBuf += deriveDefDef(stat)(_ => EmptyTree)`