2 files changed, 7 insertions, 12 deletions
diff --git a/src/library/scala/reflect/ClassTag.scala b/src/library/scala/reflect/ClassTag.scala
index 06960a5478..860406f205 100644
--- a/src/library/scala/reflect/ClassTag.scala
+++ b/src/library/scala/reflect/ClassTag.scala
@@ -39,7 +39,11 @@ abstract case class ClassTag[T](erasure: jClass[_]) extends ArrayTag[T] {
 
   /** Produces a `ClassTag` that knows how to build `Array[Array[T]]` */
   def wrap: ClassTag[Array[T]] = {
-    val arrayClazz = java.lang.reflect.Array.newInstance(erasure, 0).getClass.asInstanceOf[jClass[Array[T]]]
+    // newInstance throws an exception if the erasure is Void.TYPE
+    // see SI-5680
+    val arrayClazz =
+      if (erasure == java.lang.Void.TYPE) classOf[Array[Unit]]
+      else java.lang.reflect.Array.newInstance(erasure, 0).getClass.asInstanceOf[jClass[Array[T]]]
     ClassTag[Array[T]](arrayClazz)
   }
 
diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index 7a932c21bc..d2adc26d66 100644
--- a/src/library/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -51,17 +51,8 @@ object ScalaRunTime {
    *  e.g. classOf[int], not classOf[java.lang.Integer].  The compiler
    *  rewrites expressions like 5.getClass to come here.
    */
-  def anyValClass[T <: AnyVal](value: T): Class[T] = (value match {
-    case x: Byte    => java.lang.Byte.TYPE
-    case x: Short   => java.lang.Short.TYPE
-    case x: Char    => java.lang.Character.TYPE
-    case x: Int     => java.lang.Integer.TYPE
-    case x: Long    => java.lang.Long.TYPE
-    case x: Float   => java.lang.Float.TYPE
-    case x: Double  => java.lang.Double.TYPE
-    case x: Boolean => java.lang.Boolean.TYPE
-    case x: Unit    => java.lang.Void.TYPE
-  }).asInstanceOf[Class[T]]
+  def anyValClass[T <: AnyVal : ClassManifest](value: T): Class[T] =
+    classManifest[T].erasure.asInstanceOf[Class[T]]
 
   /** Retrieve generic array element */
   def array_apply(xs: AnyRef, idx: Int): Any = xs match {