Implemented workaround for SI-4789, no review.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/library/scala/collection/generic/GenTraversableFactory.scala b/src/library/scala/collection/generic/GenTraversableFactory.scala
index 66eb57657b..34cbe1a7f2 100644
--- a/src/library/scala/collection/generic/GenTraversableFactory.scala
+++ b/src/library/scala/collection/generic/GenTraversableFactory.scala
@@ -38,9 +38,11 @@ abstract class GenTraversableFactory[CC[X] <: GenTraversable[X] with GenericTrav
 
   // A default implementation of GenericCanBuildFrom which can be cast
   // to whatever is desired.
-  private[collection] object ReusableCBF extends GenericCanBuildFrom[Nothing] {
+  private class ReusableCBF extends GenericCanBuildFrom[Nothing] {
     override def apply() = newBuilder[Nothing]
   }
+  // Working around SI-4789 by using a lazy val instead of an object.
+  lazy val ReusableCBF: GenericCanBuildFrom[Nothing] = new ReusableCBF
 
   /** A generic implementation of the `CanBuildFrom` trait, which forwards
    *  all calls to `apply(from)` to the `genericBuilder` method of