1 files changed, 13 insertions, 14 deletions
diff --git a/src/library/scala/collection/mutable/ArrayOps.scala b/src/library/scala/collection/mutable/ArrayOps.scala
index 875030ade0..5f0e1e1071 100644
--- a/src/library/scala/collection/mutable/ArrayOps.scala
+++ b/src/library/scala/collection/mutable/ArrayOps.scala
@@ -12,7 +12,8 @@ package scala.collection
 package mutable
 import compat.Platform.arraycopy
 
-import scala.reflect.ClassManifest
+import scala.reflect.ArrayTag
+import scala.runtime.ScalaRunTime._
 
 import parallel.mutable.ParArray
 
@@ -37,10 +38,8 @@ import parallel.mutable.ParArray
  */
 abstract class ArrayOps[T] extends ArrayLike[T, Array[T]] with CustomParallelizable[T, ParArray[T]] {
 
-  private def rowBuilder[U]: Builder[U, Array[U]] =
-    Array.newBuilder(
-      ClassManifest[U](
-        repr.getClass.getComponentType.getComponentType))
+  private def elementClass: Class[_] =
+    arrayElementClass(repr.getClass)
 
   override def copyToArray[U >: T](xs: Array[U], start: Int, len: Int) {
     var l = math.min(len, repr.length)
@@ -48,11 +47,13 @@ abstract class ArrayOps[T] extends ArrayLike[T, Array[T]] with CustomParalleliza
     Array.copy(repr, 0, xs, start, l)
   }
 
-  override def toArray[U >: T : ClassManifest]: Array[U] =
-    if (implicitly[ClassManifest[U]].erasure eq repr.getClass.getComponentType)
+  override def toArray[U >: T : ArrayTag]: Array[U] = {
+    val thatElementClass = arrayElementClass(implicitly[ArrayTag[U]])
+    if (elementClass eq thatElementClass)
       repr.asInstanceOf[Array[U]]
     else
       super.toArray[U]
+  }
 
   override def par = ParArray.handoff(repr)
 
@@ -63,7 +64,7 @@ abstract class ArrayOps[T] extends ArrayLike[T, Array[T]] with CustomParalleliza
    *  @param asArray   A function that converts elements of this array to rows - arrays of type `U`.
    *  @return          An array obtained by concatenating rows of this array.
    */
-  def flatten[U, To](implicit asTrav: T => collection.Traversable[U], m: ClassManifest[U]): Array[U] = {
+  def flatten[U, To](implicit asTrav: T => collection.Traversable[U], m: ArrayTag[U]): Array[U] = {
     val b = Array.newBuilder[U]
     b.sizeHint(map{case is: collection.IndexedSeq[_] => is.size case _ => 0}.sum)
     for (xs <- this)
@@ -78,7 +79,8 @@ abstract class ArrayOps[T] extends ArrayLike[T, Array[T]] with CustomParalleliza
    *  @return         An array obtained by replacing elements of this arrays with rows the represent.
    */
   def transpose[U](implicit asArray: T => Array[U]): Array[Array[U]] = {
-    val bs = asArray(head) map (_ => rowBuilder[U])
+    def mkRowBuilder() = Array.newBuilder(ClassTag[U](arrayElementClass(elementClass)))
+    val bs = asArray(head) map (_ => mkRowBuilder())
     for (xs <- this) {
       var i = 0
       for (x <- asArray(xs)) {
@@ -86,9 +88,7 @@ abstract class ArrayOps[T] extends ArrayLike[T, Array[T]] with CustomParalleliza
         i += 1
       }
     }
-    val bb: Builder[Array[U], Array[Array[U]]] = Array.newBuilder(
-      ClassManifest[Array[U]](
-        repr.getClass.getComponentType))
+    val bb: Builder[Array[U], Array[Array[U]]] = Array.newBuilder(ClassTag[Array[U]](elementClass))
     for (b <- bs) bb += b.result
     bb.result
   }
@@ -109,8 +109,7 @@ object ArrayOps {
 
     override protected[this] def thisCollection: WrappedArray[T] = new WrappedArray.ofRef[T](repr)
     override protected[this] def toCollection(repr: Array[T]): WrappedArray[T] = new WrappedArray.ofRef[T](repr)
-    override protected[this] def newBuilder = new ArrayBuilder.ofRef[T]()(
-      ClassManifest[T](repr.getClass.getComponentType))
+    override protected[this] def newBuilder = new ArrayBuilder.ofRef[T]()(ClassTag[T](arrayElementClass(repr.getClass)))
 
     def length: Int = repr.length
     def apply(index: Int): T = repr(index)