Merge pull request #8515 from dotty-staging/ignore-bridges

Do not create symbols for classfile artifacts

Author: anatoliykmetyuk

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

@@ -567,6 +567,7 @@ object Flags {
   val TermParamOrAccessor: FlagSet           = Param | ParamAccessor
   val PrivateParamAccessor: FlagSet          = ParamAccessor | Private
   val PrivateOrSynthetic: FlagSet            = Private | Synthetic
+  val PrivateOrArtifact: FlagSet             = Private | Artifact
   val ClassTypeParam: FlagSet                = Private | TypeParam
   val Scala2Trait: FlagSet                   = Scala2x | Trait
   val SyntheticArtifact: FlagSet             = Synthetic | Artifact

compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala

@@ -341,7 +341,7 @@ object ClassfileConstants {
       case JAVA_ACC_PRIVATE    => Private
       case JAVA_ACC_PROTECTED  => Protected
       case JAVA_ACC_FINAL      => Final
-      case JAVA_ACC_SYNTHETIC  => Synthetic
+      case JAVA_ACC_SYNTHETIC  => SyntheticArtifact
       case JAVA_ACC_STATIC     => JavaStatic
       case JAVA_ACC_ENUM       => Enum
       case JAVA_ACC_ABSTRACT   => if (isClass) Abstract else Deferred

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

@@ -226,7 +226,7 @@ class ClassfileParser(
       if (method) Flags.Method | methodTranslation.flags(jflags)
       else fieldTranslation.flags(jflags)
     val name = pool.getName(in.nextChar)
-    if (!sflags.is(Flags.Private) || name == nme.CONSTRUCTOR) {
+    if (!sflags.isOneOf(Flags.PrivateOrArtifact) || name == nme.CONSTRUCTOR) {
       val member = ctx.newSymbol(
         getOwner(jflags), name, sflags, memberCompleter,
         getPrivateWithin(jflags), coord = start)

tests/pos-java-interop-separate/i6152/A_1.java

@@ -0,0 +1,8 @@
+public abstract class A_1 {
+  public abstract Object f();
+
+  public static abstract class B extends A_1 {
+    @Override
+    public abstract String f();
+  }
+}

tests/pos-java-interop-separate/i6152/C_2.scala

@@ -0,0 +1,3 @@
+class C extends A_1.B {
+  def f() = ""
+}

tests/pos-java-interop-separate/i8435/Builder_1.java

@@ -0,0 +1,4 @@
+class BuilderBase<A> {
+  public scala.Option<A> build() { return null; }
+}
+public class Builder_1<A> extends BuilderBase<A> { }

tests/pos-java-interop-separate/i8435/Test_2.scala

@@ -0,0 +1,4 @@
+object Test {
+  val builder: Builder_1[Int] = ???
+  builder.build(): Option[Int]
+}