Merge pull request #2644 from retronym/ticket/7498-backport

[backport] SI-7498 ParTrieMap.foreach no longer crashes

2 files changed, 25 insertions, 2 deletions

diff --git a/src/library/scala/collection/concurrent/TrieMap.scala b/src/library/scala/collection/concurrent/TrieMap.scala
index 6c11c5bcb5..714260fa8a 100644
--- a/src/library/scala/collection/concurrent/TrieMap.scala
+++ b/src/library/scala/collection/concurrent/TrieMap.scala
@@ -1011,8 +1011,11 @@ private[collection] class TrieMapIterator[K, V](var level: Int, private var ct:
    */
   protected def subdivide(): Seq[Iterator[(K, V)]] = if (subiter ne null) {
     // the case where an LNode is being iterated
-    val it = subiter
-    subiter = null
+    val it = newIterator(level + 1, ct, _mustInit = false)
+    it.depth = -1
+    it.subiter = this.subiter
+    it.current = null
+    this.subiter = null
     advance()
     this.level += 1
     Seq(it, this)
diff --git a/test/files/run/t7498.scala b/test/files/run/t7498.scala
new file mode 100644
index 0000000000..1dbf0597e0
--- /dev/null
+++ b/test/files/run/t7498.scala
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+object Test extends App {
+  import scala.collection.concurrent.TrieMap
+
+  class Collision(val idx: Int) {
+    override def hashCode = idx % 10
+  }
+
+  val tm = TrieMap[Collision, Unit]()
+  for (i <- 0 until 1000) tm(new Collision(i)) = ()
+
+  tm.par.foreach(kv => ())
+}
+