Skip to content

Fix #6868: Move adding annotation constructor after setting classinfo #6911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
noti0na1 wants to merge 2 commits into from
Closed

Fix #6868: Move adding annotation constructor after setting classinfo #6911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec493ef
Fix #6868: Move adding annotation constructor after setting classinfo
noti0na1 Jul 23, 2019
c5ae624
Extend test to use annotation constructor
noti0na1 Jul 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down
15 changes: 15 additions & 0 deletions tests/pos-java-interop-separate/annotation-with-inner-class-ref/MyJava_1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
public @interface MyJava_1 {

public String value() default "MyJava";

public MyClassTypeA typeA();

public MyClassTypeB typeB() default @MyClassTypeB;

public enum MyClassTypeA {
A, B
}

public @interface MyClassTypeB {}
}

13 changes: 13 additions & 0 deletions tests/pos-java-interop-separate/annotation-with-inner-class-ref/MyScala_2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@MyJava_1("MyScala1", typeA = MyJava_1.MyClassTypeA.B)
object MyScala {
def a(mj: MyJava_1): Unit = {
println("MyJava")
}

@MyJava_1(typeA = MyJava_1.MyClassTypeA.A)
def b(): Int = 1

@MyJava_1(value = "MyScala2", typeA = MyJava_1.MyClassTypeA.B)
def c(): Int = 2
}