aboutsummaryrefslogtreecommitdiff
path: root/compiler/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2016-12-21 12:11:42 +0100
committerMartin Odersky <odersky@gmail.com>2016-12-21 12:11:42 +0100
commitec35b840e71c34ea2d7c7a59a9c69ce0f44c4740 (patch)
treee99e65055b9612245540a4315ea13a958ae9efcf /compiler/test
parentcf4f773840ba3955b2907b04208b378d22d37651 (diff)
downloaddotty-ec35b840e71c34ea2d7c7a59a9c69ce0f44c4740.tar.gz
dotty-ec35b840e71c34ea2d7c7a59a9c69ce0f44c4740.tar.bz2
dotty-ec35b840e71c34ea2d7c7a59a9c69ce0f44c4740.zip
Tweak the way annotations are represented in desugaring
Need to be careful not to read a classfile before a compilation unit defining the annotation is entered.
Diffstat (limited to 'compiler/test')
-rw-r--r--compiler/test/dotc/scala-collections.blacklist3
-rw-r--r--compiler/test/dotc/scala-collections.whitelist2
2 files changed, 1 insertions, 4 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index 342317825..7d3008bbc 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -1,8 +1,5 @@
## Errors having to do with bootstrap
-../scala-scala/src/library/scala/annotation/unchecked/uncheckedVariance.scala
-#java.lang.AssertionError: assertion failed: data race? overwriting symbol of type scala.annotation.unchecked.uncheckedVariance,
-
../scala-scala/src/library/scala/Function1.scala
../scala-scala/src/library/scala/Function2.scala
# Cyclic reference because of @specialized annotation
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index 1590120d3..cb7fd29b9 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -537,7 +537,7 @@
../scala-scala/src/library/scala/annotation/tailrec.scala
../scala-scala/src/library/scala/annotation/TypeConstraint.scala
../scala-scala/src/library/scala/annotation/unchecked/uncheckedStable.scala
-#../scala-scala/src/library/scala/annotation/unchecked/uncheckedVariance.scala
+../scala-scala/src/library/scala/annotation/unchecked/uncheckedVariance.scala
../scala-scala/src/library/scala/annotation/unspecialized.scala
../scala-scala/src/library/scala/annotation/varargs.scala