Merge pull request #1179 from scalamacros/topic/classtag-of-nothing

reverts changes to ClassTag.Nothing

2 files changed, 32 insertions, 37 deletions

diff --git a/src/library/scala/reflect/ClassTag.scala b/src/library/scala/reflect/ClassTag.scala
index 7b6df6e31c..5255c44f10 100644
--- a/src/library/scala/reflect/ClassTag.scala
+++ b/src/library/scala/reflect/ClassTag.scala
@@ -64,6 +64,7 @@ trait ClassTag[T] extends ClassManifestDeprecatedApis[T] with Equals with Serial
 }
 
 object ClassTag {
+  private val NothingTYPE = classOf[scala.runtime.Nothing$]
   private val NullTYPE = classOf[scala.runtime.Null$]
   private val ObjectTYPE = classOf[java.lang.Object]
 
@@ -80,13 +81,7 @@ object ClassTag {
   val Object  : ClassTag[java.lang.Object] = new ClassTag[java.lang.Object]{ def runtimeClass = ObjectTYPE; private def readResolve() = ClassTag.Object }
   val AnyVal  : ClassTag[scala.AnyVal]     = ClassTag.Object.asInstanceOf[ClassTag[scala.AnyVal]]
   val AnyRef  : ClassTag[scala.AnyRef]     = ClassTag.Object.asInstanceOf[ClassTag[scala.AnyRef]]
-  val Nothing : ClassTag[scala.Nothing]    = new ClassTag[scala.Nothing]{
-    def runtimeClass = throw new Exception("Nothing is a bottom type, therefore its erasure does not return a value")
-    private def readResolve() = ClassTag.Nothing
-    override def equals(x: Any) = x.isInstanceOf[ClassTag[_]] && (x.asInstanceOf[AnyRef] eq ClassTag.Nothing)
-    override def hashCode = System.identityHashCode(this)
-    override def toString = "ClassTag[Nothing]"
-  }
+  val Nothing : ClassTag[scala.Nothing]    = new ClassTag[scala.Nothing]{ def runtimeClass = NothingTYPE; private def readResolve() = ClassTag.Nothing }
   val Null    : ClassTag[scala.Null]       = new ClassTag[scala.Null]{ def runtimeClass = NullTYPE; private def readResolve() = ClassTag.Null }
 
   def apply[T](runtimeClass1: jClass[_]): ClassTag[T] =
diff --git a/test/files/run/classtags_core.check b/test/files/run/classtags_core.check
index 2241108ba0..6519db2178 100644
--- a/test/files/run/classtags_core.check
+++ b/test/files/run/classtags_core.check
@@ -1,30 +1,30 @@
-true
-ClassTag[byte]
-true
-ClassTag[short]
-true
-ClassTag[char]
-true
-ClassTag[int]
-true
-ClassTag[long]
-true
-ClassTag[float]
-true
-ClassTag[double]
-true
-ClassTag[boolean]
-true
-ClassTag[void]
-true
-ClassTag[class java.lang.Object]
-true
-ClassTag[class java.lang.Object]
-true
-ClassTag[class java.lang.Object]
-true
-ClassTag[class java.lang.Object]
-true
-ClassTag[class scala.runtime.Null$]
-true
-ClassTag[Nothing]
+true

+ClassTag[byte]

+true

+ClassTag[short]

+true

+ClassTag[char]

+true

+ClassTag[int]

+true

+ClassTag[long]

+true

+ClassTag[float]

+true

+ClassTag[double]

+true

+ClassTag[boolean]

+true

+ClassTag[void]

+true

+ClassTag[class java.lang.Object]

+true

+ClassTag[class java.lang.Object]

+true

+ClassTag[class java.lang.Object]

+true

+ClassTag[class java.lang.Object]

+true

+ClassTag[class scala.runtime.Null$]

+true

+ClassTag[class scala.runtime.Nothing$]