Merge pull request #1833 from dotty-staging/fix-#1793

Fix #1793: allow multiversal comparisons between Null and X

2 files changed, 1 insertions, 5 deletions

diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index f7744401a..97f12244e 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -164,11 +164,6 @@
 #     |                ^^^
 #     |                not found: msg
 
-../scala-scala/src/library/scala/ref/WeakReference.scala
-# 33 |    if (x != null) Some(x) else None
-#    |       ^^^^^^^^^^^
-#    |       Values of types wr.underlying.java$lang$ref$WeakReference$$T and Null cannot be compared with == or !=
-
 ../scala-scala/src/library/scala/reflect/ClassManifestDeprecatedApis.scala
 # 51 |      import Manifest._
 #    |             ^^^^^^^^
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index 33c8e22f0..cdec1ab12 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -423,6 +423,7 @@
 ../scala-scala/src/library/scala/ref/ReferenceQueue.scala
 ../scala-scala/src/library/scala/ref/ReferenceWrapper.scala
 ../scala-scala/src/library/scala/ref/SoftReference.scala
+../scala-scala/src/library/scala/ref/WeakReference.scala
 
 ../scala-scala/src/library/scala/reflect/macros/internal/macroImpl.scala
 ../scala-scala/src/library/scala/reflect/NoManifest.scala