summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorMaxim Valyanskiy <max.valjanski@gmail.com>2014-10-17 23:19:54 +0400
committerMaxim Valyanskiy <max.valjanski@gmail.com>2014-11-27 09:36:26 +0300
commit0bb8a139e9c46e3e1b4bd7af5dd11cb689ebbe8e (patch)
tree4141ea2586e252202447603071bb5fa348ce7b76 /src/library
parent3ac6eabae685f08fb349ddab16cbaa1c6e97984b (diff)
downloadscala-0bb8a139e9c46e3e1b4bd7af5dd11cb689ebbe8e.tar.gz
scala-0bb8a139e9c46e3e1b4bd7af5dd11cb689ebbe8e.tar.bz2
scala-0bb8a139e9c46e3e1b4bd7af5dd11cb689ebbe8e.zip
SI-8924 don't hold reference to list in iterator
Current implementation of LinearSeqLike.iterator holds reference to complete sequence. This prevent garbage collecting of List elements while we keep reference to iterator somewhere. This commit removes reference from Iterator implementation. This allow garbage collection of List while we iterating over its elements (when there is no other references to List in our program).
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/LinearSeqLike.scala14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/library/scala/collection/LinearSeqLike.scala b/src/library/scala/collection/LinearSeqLike.scala
index ff7985bf0d..6fb452797e 100644
--- a/src/library/scala/collection/LinearSeqLike.scala
+++ b/src/library/scala/collection/LinearSeqLike.scala
@@ -58,12 +58,18 @@ trait LinearSeqLike[+A, +Repr <: LinearSeqLike[A, Repr]] extends SeqLike[A, Repr
val result = these.head; these = these.tail; result
} else Iterator.empty.next()
- /** Have to clear `these` so the iterator is exhausted like
- * it would be without the optimization.
- */
override def toList: List[A] = {
+ /* Have to clear `these` so the iterator is exhausted like
+ * it would be without the optimization.
+ *
+ * Calling "newBuilder.result()" in toList method
+ * prevents original seq from garbage collection,
+ * so we use these.take(0) here.
+ *
+ * Check SI-8924 for details
+ */
val xs = these.toList
- these = newBuilder.result()
+ these = these.take(0)
xs
}
}