fix scalapb build

Author: changvvb

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

@@ -54,10 +54,10 @@ object ContextOps:
           // can be referenced from an ident in a subclass or by a selection prefixed by the subclass.
           val toSearch = if (preSym.is(Flags.Module)) then
             if preSym.companionClass.exists then
-              preSym.companionClass.asClass.nonSelfBaseClasses
+              preSym.companionClass.asClass.baseClasses
             else Nil
           else
-            preSym.asClass.nonSelfBaseClasses
+            preSym.asClass.baseClasses
 
           toSearch.iterator.map { bc =>
             val pre1 = bc.thisType

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

@@ -1866,9 +1866,6 @@ object SymDenotations {
     def baseClasses(implicit onBehalf: BaseData, ctx: Context): List[ClassSymbol] =
       baseData._1
 
-    def nonSelfBaseClasses(implicit onBehalf: BaseData, ctx: Context): List[ClassSymbol] =
-      baseClasses.tail
-
     /** Like `baseClasses.length` but more efficient. */
     def baseClassesLength(using BaseData, Context): Int =
       // `+ 1` because the baseClassSet does not include the current class unlike baseClasses

tests/pos/java-inherited-type1/Test.scala

@@ -5,4 +5,9 @@ object Test {
   j.ident1(null);
   j.select(null);
   j.select1(null);
+
+  val message:TestMessage = null
+  val builder:TestMessage.Builder = message.toBuilder
+  builder.setName("name")
+
 }

tests/pos/java-inherited-type1/TestMessage.java

@@ -0,0 +1,17 @@
+abstract class AbstractMessage  {
+  public static abstract class Builder<BuilderType extends Builder<BuilderType>> {
+  }
+}
+
+class TestMessage extends AbstractMessage {
+
+  public Builder toBuilder() {
+    return null;
+  }
+
+  public static class Builder extends AbstractMessage.Builder<Builder> {
+    public Builder setName(String name) {
+      return this;
+    }
+  }
+}