Merge pull request scala#4661 from retronym/ticket/9365

SI-9365 Don't null out dependencies of transient lazy vals

Author: lrytz

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

test/files/run/t720.scala

@@ -0,0 +1,48 @@
+class Lazy(f: => Int) {
+  lazy val get: Int = f
+}
+
+class UsedLater(f: => Int) {
+  lazy val get: Int = f
+  def other = f
+}
+
+class TransientLazy(f: => Int) {
+  @transient
+  lazy val get: Int = f
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    testLazy()
+    testUsedLater()
+  }
+
+  def testLazy() {
+    val o = new Lazy("".length)
+    val f = classOf[Lazy].getDeclaredField("f")
+    f.setAccessible(true)
+    assert(f.get(o) != null)
+    o.get
+    assert(f.get(o) == null)
+  }
+
+  def testUsedLater() {
+    val o = new UsedLater("".length)
+    val f = classOf[UsedLater].getDeclaredField("f")
+    f.setAccessible(true)
+    assert(f.get(o) != null)
+    o.get
+    assert(f.get(o) != null)
+  }
+
+  def testTransientLazy() {
+    val o = new TransientLazy("".length)
+    val f = classOf[TransientLazy].getDeclaredField("f")
+    f.setAccessible(true)
+    assert(f.get(o) != null)
+    o.get
+    assert(f.get(o) != null) // SI-9365
+  }
+}
+

test/files/run/t9365.check

@@ -0,0 +1,2 @@
+foo
+foo

test/files/run/t9365.scala

@@ -0,0 +1,18 @@
+class Test(x: => Object) extends Serializable {
+  @transient lazy val foo = x
+}
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    import java.io._
+    val t = new Test("foo")
+    println(t.foo)
+    val baos = new ByteArrayOutputStream
+    val dos = new ObjectOutputStream(baos)
+    dos.writeObject(t)
+    dos.close()
+    val dis = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()))
+    val t1 = dis.readObject().asInstanceOf[Test]
+    println(t1.foo) // was NPE
+  }
+}