Fixed bug #1287, lazy vals in trait methods.

2 files changed, 10 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/LazyVals.scala b/src/compiler/scala/tools/nsc/transform/LazyVals.scala
index e4cfa6029f..74fa713430 100644
--- a/src/compiler/scala/tools/nsc/transform/LazyVals.scala
+++ b/src/compiler/scala/tools/nsc/transform/LazyVals.scala
@@ -42,6 +42,8 @@ abstract class LazyVals extends Transform {
     /** Perform the following transformations:
      *  - for a lazy accessor inside a method, make it check the initialization bitmap
      *  - for all methods, add enough int vars to allow one flag per lazy local value
+     *  - remove ACCESSOR flags: accessors in traits are not statically implemented,
+     *    but moved to the host class. local lazy values should be statically implemented.
      */
     override def transform(tree: Tree): Tree = {
        val sym = tree.symbol
@@ -51,7 +53,7 @@ abstract class LazyVals extends Transform {
             val idx = lazyVals(sym.enclMethod)
             val rhs1 = mkLazyDef(sym.enclMethod, super.transform(rhs), idx)
             lazyVals(sym.owner) = idx + 1
-            sym.resetFlag(LAZY)
+            sym.resetFlag(LAZY | ACCESSOR)
             rhs1
           } else
             super.transform(rhs)
diff --git a/test/files/run/lazy-traits.scala b/test/files/run/lazy-traits.scala
index f91da7ed1a..6238813e8d 100644
--- a/test/files/run/lazy-traits.scala
+++ b/test/files/run/lazy-traits.scala
@@ -116,6 +116,13 @@ trait PrivateLazy {
 /** Test successful compilation. */
 class InheritPrivateLazy extends AnyRef with PrivateLazy {}
 
+/** Test successful compilation, see bug #1287. */
+trait LocalLazyVal {
+  def foo = {
+    lazy val next = 10 + 1
+    next
+  }
+}
 
 object Test extends Application {