Merge pull request scala/scala#9335 from SethTisue/fix-array-empty-unit

SethTisue · web-flow · commit 3c5e1a87a2dd · 2020-11-22T18:02:12.000-08:00
fix never-released 2.12.13 regression where Array[Unit].empty caused NPE
diff --git a/library/src/scala/reflect/ClassTag.scala b/library/src/scala/reflect/ClassTag.scala
@@ -53,7 +53,7 @@ trait ClassTag[T] extends ClassManifestDeprecatedApis[T] with Equals with Serial
 
   @transient private[scala] lazy val emptyArray       : Array[T]                = {
     val componentType =
-      if (runtimeClass eq classOf[Void]) classOf[BoxedUnit] else runtimeClass
+      if (runtimeClass eq java.lang.Void.TYPE) classOf[BoxedUnit] else runtimeClass
     java.lang.reflect.Array.newInstance(componentType, 0).asInstanceOf[Array[T]]
   }
   @transient private[scala] lazy val emptyWrappedArray: mutable.WrappedArray[T] =

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ trait ClassTag[T] extends ClassManifestDeprecatedApis[T] with Equals with Serial`
`53`	`53`
`54`	`54`	`@transient private[scala] lazy val emptyArray : Array[T] = {`
`55`	`55`	`val componentType =`
`56`		`- if (runtimeClass eq classOf[Void]) classOf[BoxedUnit] else runtimeClass`
	`56`	`+ if (runtimeClass eq java.lang.Void.TYPE) classOf[BoxedUnit] else runtimeClass`
`57`	`57`	`java.lang.reflect.Array.newInstance(componentType, 0).asInstanceOf[Array[T]]`
`58`	`58`	`}`
`59`	`59`	`@transient private[scala] lazy val emptyWrappedArray: mutable.WrappedArray[T] =`