Skip to content

Test to show non-determinism in annotation ordering #35

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

Merged
merged 1 commit into from
Jan 22, 2019
Merged

Test to show non-determinism in annotation ordering #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,11 +1436,13 @@ abstract class RefChecks extends Transform {
checkTypeRefBounds(ann.tpe, tree)
}

annots
.map(_.transformArgs(transformTrees))
.groupBy(_.symbol)
.flatMap((groupRepeatableAnnotations _).tupled)
.toList
val annotsBySymbol = new mutable.LinkedHashMap[Symbol, ListBuffer[AnnotationInfo]]()
val transformedAnnots = annots.map(_.transformArgs(transformTrees))
for (transformedAnnot <- transformedAnnots) {
val buffer = annotsBySymbol.getOrElseUpdate(transformedAnnot.symbol, new ListBuffer)
buffer += transformedAnnot
}
annotsBySymbol.iterator.flatMap(x => groupRepeatableAnnotations(x._1, x._2.toList)).toList
}

// assumes non-empty `anns`
Expand Down
95 changes: 93 additions & 2 deletions test/junit/scala/tools/nsc/DeterminismTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
package scala.tools.nsc

import java.io.{File, OutputStreamWriter}
import java.nio.charset.Charset
import java.nio.file.attribute.BasicFileAttributes
import java.nio.file.{FileVisitResult, Files, Path, SimpleFileVisitor}
import java.util

import javax.tools.ToolProvider
import org.junit.Test

import scala.collection.JavaConverters.asScalaIteratorConverter
import scala.collection.JavaConverters.{asScalaIteratorConverter, seqAsJavaListConverter}
import scala.collection.immutable
import scala.language.implicitConversions
import scala.reflect.internal.util.{BatchSourceFile, SourceFile}
import scala.reflect.io.PlainNioFile
Expand Down Expand Up @@ -187,6 +191,78 @@ class DeterminismTest {
test(List(code))
}

@Test def testAnnotations1(): Unit = {
def code = List[SourceFile](
source("a.scala",
"""
|class Annot1(s: String) extends scala.annotation.StaticAnnotation
|class Annot2(s: Class[_]) extends scala.annotation.StaticAnnotation
|
""".stripMargin),
source("b.scala",
"""
|@Annot1("foo")
|@Annot2(classOf[AnyRef])
|class Test
""".stripMargin)
)
test(List(code))
}

@Test def testAnnotationsJava(): Unit = {
def code = List[SourceFile](
source("Annot1.java",
"""
|import java.lang.annotation.*;
|@Retention(RetentionPolicy.RUNTIME)
|@Target(ElementType.TYPE)
|@Inherited
|@interface Annot1 { String value() default ""; }
|
|@Retention(RetentionPolicy.RUNTIME)
|@Target(ElementType.TYPE)
|@Inherited
|@interface Annot2 { Class value(); }
|
""".stripMargin),
source("b.scala",
"""
|@Annot1("foo") @Annot2(classOf[AnyRef]) class Test
""".stripMargin)
)
test(List(code))
}

@Test def testAnnotationsJavaRepeatable(): Unit = {
val javaAnnots = source("Annot1.java",
"""
|import java.lang.annotation.*;
|@Repeatable(Annot1.Container.class)
|@Retention(RetentionPolicy.RUNTIME)
|@Target(ElementType.TYPE)
|@interface Annot1 { String value() default "";
|
| @Retention(RetentionPolicy.RUNTIME)
| @Target(ElementType.TYPE)
| public static @interface Container {
| Annot1[] value();
| }
|}
|
|@Retention(RetentionPolicy.RUNTIME)
|@Target(ElementType.TYPE)
|@Inherited
|@interface Annot2 { Class value(); }
""".stripMargin)
def code =
List(source("dummy.scala", ""), source("b.scala",
"""
|@Annot1("foo") @Annot2(classOf[String]) @Annot1("bar") class Test
""".stripMargin)
)
test(List(javaAnnots) :: code :: Nil)
}

def source(name: String, code: String): SourceFile = new BatchSourceFile(name, code)
private def test(groups: List[List[SourceFile]]): Unit = {
val referenceOutput = Files.createTempDirectory("reference")
Expand All @@ -202,7 +278,22 @@ class DeterminismTest {
val r = new Run
// println("scalac " + files.mkString(" "))
r.compileSources(files)
assert(!storeReporter.hasErrors, storeReporter.infos.mkString("\n"))
Predef.assert(!storeReporter.hasErrors, storeReporter.infos.mkString("\n"))
files.filter(_.file.name.endsWith(".java")) match {
case Nil =>
case javaSources =>
def tempFileFor(s: SourceFile): Path = {
val f = output.resolve(s.file.name)
Files.write(f, new String(s.content).getBytes(Charset.defaultCharset()))
}
val options = List("-d", output.toString)
val javac = ToolProvider.getSystemJavaCompiler
val fileMan = javac.getStandardFileManager(null, null, null)
val javaFileObjects = fileMan.getJavaFileObjects(javaSources.map(s => tempFileFor(s).toAbsolutePath.toString): _*)
val task = javac.getTask(new OutputStreamWriter(System.out), fileMan, null, options.asJava, Nil.asJava, javaFileObjects)
val result = task.call()
Predef.assert(result)
}
}

for (group <- groups.init) {
Expand Down