Merge pull request #10031 from som-snytt/issue/trivial-npe

SethTisue · web-flow · commit 3ed3e3f91a4b · 2022-05-10T11:14:49.000+01:00
diff --git a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala
@@ -531,7 +531,7 @@ trait TypeDiagnostics extends splain.SplainDiagnostics {
 
     // so trivial that it never consumes params
     def isTrivial(rhs: Tree): Boolean =
-      rhs.symbol == Predef_??? || rhs.tpe =:= NothingTpe || (rhs match {
+      rhs.symbol == Predef_??? || rhs.tpe == null || rhs.tpe =:= NothingTpe || (rhs match {
         case Literal(_) => true
         case _          => isConstantType(rhs.tpe) || isSingleType(rhs.tpe)
       })
