Strip Nulls from Java calls under unsafeNulls

Author: noti0na1

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -3746,6 +3746,15 @@ class Typer extends Namer
         if target <:< pt then
           return readapt(tree.cast(target))
 
+      // if unsafeNulls is enabled, try to strip nulls from Java function calls
+      if Nullables.unsafeNullsEnabled then
+        tree match
+          case _: Apply if tree.symbol.is(JavaDefined) =>
+            wtp match
+              case OrNull(wtp1) => return readapt(tree.cast(wtp1))
+              case _ =>
+          case _ =>
+
       def recover(failure: SearchFailureType) =
         if canDefineFurther(wtp) || canDefineFurther(pt) then readapt(tree)
         else err.typeMismatch(tree, pt, failure)

tests/explicit-nulls/unsafe-common/unsafe-java-call/J.java

@@ -0,0 +1,13 @@
+public class J {
+  public String f1() {
+    return "";
+  }
+
+  public int f2() {
+    return 0;
+  }
+
+  public <T> T g1() {
+    return null;
+  }
+}

tests/explicit-nulls/unsafe-common/unsafe-java-call/S.scala

@@ -0,0 +1,21 @@
+import scala.language.unsafeNulls
+
+val j: J = new J
+
+val s1: String = j.f1()
+
+val i1: Int = j.f2()
+
+val s2: String = j.g1[String]()
+
+val i2: Int = j.g1[Int]()
+
+val a1: Any = j.g1[Any]()
+
+val ar1: AnyRef = j.g1[AnyRef]()
+
+val n1: Null = j.g1[Null]()
+
+val ar2: AnyRef = j.g1[Null]()
+
+def clo[T]: T = j.g1[T]()