From 5b78ac790ea4aca495e8a27f93bc62e9bdd18bfe Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 11 Jan 2018 15:39:08 +0100 Subject: [PATCH 1/2] Remove all entries from the stdlib blacklist --- .../test/dotc/scala-collections.blacklist | 24 +------------------ scala2-library | 2 +- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist index f6c7539fe67f..b04ce1546d95 100644 --- a/compiler/test/dotc/scala-collections.blacklist +++ b/compiler/test/dotc/scala-collections.blacklist @@ -1,23 +1 @@ -## Errors having to do with unavailable APIs or language features: - -scala/text/Document.scala -# Lots of type errors for pattern matches, having to do with the fact -# that Document contains a :: method without corresponding extractor, -# but still wants to extract lists using ::. We won't support that. -# Since Document should have been removed already, let's ignore it. - -scala/AnyVal.scala -# 55 |abstract class AnyVal extends Any { -# |^ -# |illegal redefinition of standard class AnyVal -# (This is intended) - -scala/reflect/package.scala -# 63 | private[scala] def materializeClassTag[T](): ClassTag[T] = macro ??? -# | ^^^^^ -# | not found: macro - -scala/StringContext.scala -# 168 | def f[A >: Any](args: A*): String = macro ??? -# | ^^^^^ -# | not found: macro +## The blacklist is currently empty diff --git a/scala2-library b/scala2-library index 38cc0fc5a4ef..e588767817e4 160000 --- a/scala2-library +++ b/scala2-library @@ -1 +1 @@ -Subproject commit 38cc0fc5a4ef6e7c3509783a838c02d5c72693f9 +Subproject commit e588767817e4985852f6547fc7cf211a8a7df3fa From 1208680d1dc3ce721ba36a79f3882b858007955a Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 11 Jan 2018 19:39:27 +0100 Subject: [PATCH 2/2] Add reflect/package.scala to the blacklist to avoid cycles --- compiler/test/dotc/scala-collections.blacklist | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist index b04ce1546d95..dead17647e64 100644 --- a/compiler/test/dotc/scala-collections.blacklist +++ b/compiler/test/dotc/scala-collections.blacklist @@ -1 +1,5 @@ -## The blacklist is currently empty +## Compiling the scala.reflect package object together with other files sometimes leads to cycles, +## but only when compiling with a non-bootstrapped dotty-library, because unpickling DottyPredef +## requires scala.reflect.ScalaSignature which forces the scala.reflect package object. +## Since we'll eventually be fully bootstrapped, it's not worth fixing by adding workarounds. +scala/reflect/package.scala