Merge pull request #12905 from lampepfl/i4004

Restricts `isInstanceOf[Null]` checks
scala · Jun 23, 2021 · 2ccf681 · 2ccf681
2 parents 51f3487 + ca4aa16
commit 2ccf681
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -1196,6 +1196,8 @@ class Definitions {
 
   @tu lazy val topClasses: Set[Symbol] = Set(AnyClass, MatchableClass, ObjectClass, AnyValClass)
 
+  @tu lazy val untestableClasses: Set[Symbol] = Set(NothingClass, NullClass, SingletonClass)
+
   @tu lazy val AbstractFunctionType: Array[TypeRef] = mkArityArray("scala.runtime.AbstractFunction", MaxImplementedFunctionArity, 0)
   val AbstractFunctionClassPerRun: PerRun[Array[Symbol]] = new PerRun(AbstractFunctionType.map(_.symbol.asClass))
   def AbstractFunctionClass(n: Int)(using Context): Symbol = AbstractFunctionClassPerRun()(using ctx)(n)

diff --git a/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala b/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala
@@ -339,8 +339,14 @@ object TypeTestsCasts {
           case AppliedType(tref: TypeRef, _) if tref.symbol == defn.PairClass =>
             ref(defn.RuntimeTuples_isInstanceOfNonEmptyTuple).appliedTo(expr)
           case _ =>
-            val erasedTestType = erasure(testType)
-            transformIsInstanceOf(expr, erasedTestType, erasedTestType, flagUnrelated)
+            val testWidened = testType.widen
+            defn.untestableClasses.find(testWidened.isRef(_)) match
+              case Some(untestable) =>
+                report.error(i"$untestable cannot be used in runtime type tests", tree.srcPos)
+                constant(expr, Literal(Constant(false)))
+              case _ =>
+                val erasedTestType = erasure(testType)
+                transformIsInstanceOf(expr, erasedTestType, erasedTestType, flagUnrelated)
         }
 
         if (sym.isTypeTest) {

diff --git a/tests/explicit-nulls/pos/matchable.scala b/tests/explicit-nulls/pos/matchable.scala
@@ -1,3 +1 @@
-def foo1[T <: Matchable](t: T) = t match { case t: Null => () }
-
 def foo2[T <: Matchable](t: T) = t match { case null => () }
diff --git a/tests/neg/i4004.scala b/tests/neg/i4004.scala
@@ -0,0 +1,16 @@
+@main def Test =
+  "a".isInstanceOf[Null] // error
+  null.isInstanceOf[Null] // error
+  "a".isInstanceOf[Nothing] // error
+  "a".isInstanceOf[Singleton] // error
+
+  "a" match
+  case _: Null => () // error
+  case _: Nothing => () // error
+  case _: Singleton => () // error
+  case _ => ()
+
+  null match
+  case _: Null => () // error
+  case _ => ()
+
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		def foo1[T <: Matchable](t: T) = t match { case t: Null => () }

		def foo2[T <: Matchable](t: T) = t match { case null => () }