Fix #6868: Move adding annotation constructor after setting classinfo

Author: noti0na1

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

@@ -166,13 +166,14 @@ class ClassfileParser(
       for (i <- 0 until in.nextChar) parseMember(method = false)
       for (i <- 0 until in.nextChar) parseMember(method = true)
       classInfo = parseAttributes(classRoot.symbol, classInfo)
-      if (isAnnotation) addAnnotationConstructor(classInfo)
 
       classRoot.registerCompanion(moduleRoot.symbol)
       moduleRoot.registerCompanion(classRoot.symbol)
 
-      setClassInfo(classRoot, classInfo, fromScala2 = false)
-      setClassInfo(moduleRoot, staticInfo, fromScala2 = false)
+      setClassInfo(classRoot, classInfo, fromScala2 = false, isAnnotation = isAnnotation)
+      setClassInfo(moduleRoot, staticInfo, fromScala2 = false, isAnnotation = isAnnotation)
+
+      if (isAnnotation) addAnnotationConstructor(classInfo)
     } else if (result == Some(NoEmbedded)) {
       for (sym <- List(moduleRoot.sourceModule, moduleRoot.symbol, classRoot.symbol)) {
         classRoot.owner.asClass.delete(sym)

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

@@ -95,7 +95,7 @@ object Scala2Unpickler {
       cls.enter(constr, scope)
     }
 
-  def setClassInfo(denot: ClassDenotation, info: Type, fromScala2: Boolean, selfInfo: Type = NoType)(implicit ctx: Context): Unit = {
+  def setClassInfo(denot: ClassDenotation, info: Type, fromScala2: Boolean, selfInfo: Type = NoType, isAnnotation: Boolean = false)(implicit ctx: Context): Unit = {
     val cls = denot.classSymbol
     val (tparams, TempClassInfoType(parents, decls, clazz)) = info match {
       case TempPolyType(tps, cinfo) => (tps, cinfo)
@@ -120,7 +120,8 @@ object Scala2Unpickler {
       if (tsym.exists) tsym.setFlag(TypeParam)
       else denot.enter(tparam, decls)
     }
-    if (!denot.flagsUNSAFE.isAllOf(JavaModule)) ensureConstructor(denot.symbol.asClass, decls)
+    if (!denot.flagsUNSAFE.isAllOf(JavaModule) && !isAnnotation)
+      ensureConstructor(denot.symbol.asClass, decls)
 
     val scalacCompanion = denot.classSymbol.scalacLinkedClass
 

tests/pos-java-interop-separate/annotation-with-inner-class-ref/MyJava_1.java

@@ -0,0 +1,13 @@
+public @interface MyJava_1 {
+
+    public MyClassTypeA typeA() default MyClassTypeA.A;
+
+    public MyClassTypeB typeB();
+
+    public enum MyClassTypeA {
+	A
+    }
+
+    public @interface MyClassTypeB {}
+}
+

tests/pos-java-interop-separate/annotation-with-inner-class-ref/MyScala_2.scala

@@ -0,0 +1,6 @@
+object MyScala {
+  def a(mj: MyJava_1): Unit = {
+    println("MyJava")
+  }
+}
+