Merge branch 'lampepfl:main' into dotty-scaladoc

Author: michelou

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

@@ -1388,7 +1388,7 @@ object SymDenotations {
     final def accessBoundary(base: Symbol)(using Context): Symbol =
       if (this.is(Private)) owner
       else if (this.isAllOf(StaticProtected)) defn.RootClass
-      else if (privateWithin.exists && !ctx.phase.erasedTypes) privateWithin
+      else if (privateWithin.exists && (!ctx.phase.erasedTypes || this.is(JavaDefined))) privateWithin
       else if (this.is(Protected)) base
       else defn.RootClass
 

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -3014,7 +3014,7 @@ object Types {
     private[Types] var opened: Boolean = false
     private[Types] var openedTwice: Boolean = false
 
-    val parent: Type = parentExp(this)
+    val parent: Type = parentExp(this: @unchecked)
 
     private var myRecThis: RecThis | Null = null
 
@@ -3705,8 +3705,8 @@ object Types {
 
     type This = MethodType
 
-    val paramInfos: List[Type] = paramInfosExp(this)
-    val resType: Type = resultTypeExp(this)
+    val paramInfos: List[Type] = paramInfosExp(this: @unchecked)
+    val resType: Type = resultTypeExp(this: @unchecked)
     assert(resType.exists)
 
     def companion: MethodTypeCompanion
@@ -3879,8 +3879,8 @@ object Types {
     type This = HKTypeLambda
     def companion: HKTypeLambda.type = HKTypeLambda
 
-    val paramInfos: List[TypeBounds] = paramInfosExp(this)
-    val resType: Type = resultTypeExp(this)
+    val paramInfos: List[TypeBounds] = paramInfosExp(this: @unchecked)
+    val resType: Type = resultTypeExp(this: @unchecked)
 
     private def setVariances(tparams: List[LambdaParam], vs: List[Variance]): Unit =
       if tparams.nonEmpty then
@@ -3948,8 +3948,8 @@ object Types {
     type This = PolyType
     def companion: PolyType.type = PolyType
 
-    val paramInfos: List[TypeBounds] = paramInfosExp(this)
-    val resType: Type = resultTypeExp(this)
+    val paramInfos: List[TypeBounds] = paramInfosExp(this: @unchecked)
+    val resType: Type = resultTypeExp(this: @unchecked)
 
     assert(resType.isInstanceOf[TermType], this)
     assert(paramNames.nonEmpty)

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

@@ -305,7 +305,7 @@ object RefChecks {
       def info = self.memberInfo(sym1)
       val infoStr =
         if (sym1.isAliasType) i", which equals ${info.bounds.hi}"
-        else if (sym1.isAbstractOrParamType) i" with bounds$info"
+        else if (sym1.isAbstractOrParamType && info != TypeBounds.empty) i" with bounds$info"
         else if (sym1.is(Module)) ""
         else if (sym1.isTerm) i" of type $info"
         else ""
@@ -430,6 +430,10 @@ object RefChecks {
         // direct overrides were already checked on completion (see Checking.chckWellFormed)
         // the test here catches indirect overriddes between two inherited base types.
         overrideError("cannot be used here - class definitions cannot be overridden")
+      else if (other.isOpaqueAlias)
+        // direct overrides were already checked on completion (see Checking.chckWellFormed)
+        // the test here catches indirect overriddes between two inherited base types.
+        overrideError("cannot be used here - opaque type aliases cannot be overridden")
       else if (!other.is(Deferred) && member.isClass)
         overrideError("cannot be used here - classes can only override abstract types")
       else if other.isEffectivelyFinal then // (1.2)

project/Build.scala

@@ -57,7 +57,7 @@ object DottyJSPlugin extends AutoPlugin {
 object Build {
   import ScaladocConfigs._
 
-  val referenceVersion = "3.1.2-RC1"
+  val referenceVersion = "3.1.2-RC2"
 
   val baseVersion = "3.1.3-RC1"
 

tests/neg/i14659.scala

@@ -0,0 +1,13 @@
+trait Foo {
+  opaque type Out = Int
+  def out1: Out
+  def out2: Out = out1
+}
+
+object Bar extends Foo {
+  override opaque type Out = String // error
+  override def out1 = "abc"
+}
+
+@main def run() =
+  val x = Bar.out2

tests/run/forwarder-java-package-private.check

@@ -0,0 +1 @@
+public static java.lang.String scalapackage.Foo.publicMethod()

tests/run/forwarder-java-package-private/Base_1.java

@@ -0,0 +1,11 @@
+package javapackage;
+
+public class Base_1 {
+    int packagePrivateMethod() {
+        return 42;
+    }
+
+    public String publicMethod() {
+        return "foo";
+    }
+}

tests/run/forwarder-java-package-private/Test_2.scala

@@ -0,0 +1,12 @@
+package scalapackage:
+  object Foo extends javapackage.Base_1
+end scalapackage
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    println(
+      Class.forName("scalapackage.Foo").getMethods
+        .filter(m => (m.getModifiers & java.lang.reflect.Modifier.STATIC) != 0)
+        .mkString("\n"))
+  }
+}