Fix class vals, keep annotation loonger

Author: noti0na1

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

@@ -912,7 +912,10 @@ trait Applications extends Compatibility {
             var app = ApplyTo(tree, fun1, funRef, proto, pt)
             if ctx.mode.is(Mode.UnsafeJavaReturn) then
               val funSym = fun1.symbol
-              if funSym.is(JavaDefined) && !funSym.isConstructor then
+              if funSym.is(JavaDefined)
+                && funSym.isTerm
+                && funSym.is(Method)
+                && !funSym.isConstructor then
                 val rtp1 = app.tpe
                 val rtp2 = rtp1.replaceOrNull
                 if rtp1 ne rtp2 then

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

@@ -655,7 +655,15 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
             else qual
         }
       else qual
-      typedSelect(tree, pt, qual1).withSpan(tree.span).computeNullable()
+      var sel = typedSelect(tree, pt, qual1).withSpan(tree.span).computeNullable()
+      if ctx.mode.is(Mode.UnsafeJavaReturn) && pt != AssignProto then
+        val sym = sel.symbol
+        if sym.is(JavaDefined) && sym.isTerm && !sym.is(Method) then
+          val stp1 = sel.tpe.widen
+          val stp2 = stp1.replaceOrNull
+          if stp1 ne stp2 then
+            sel = sel.cast(stp2)
+      sel
 
     def javaSelectOnType(qual: Tree)(using Context) =
       // semantic name conversion for `O$` in java code

library/src/scala/annotation/CanEqualNull.scala

@@ -1,3 +1,3 @@
 package scala.annotation
 
-final class CanEqualNull extends StaticAnnotation
+final class CanEqualNull extends RefiningAnnotation