Skip to content

Improve whitelist infrastructure. #1880

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 4 commits into from
Jan 12, 2017
Merged

Improve whitelist infrastructure. #1880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66a3409
Add stdlib whitelist loader.
nicolasstucki Jan 5, 2017
d81fbda
Remove whitelist and keep only blacklist.
nicolasstucki Jan 5, 2017
fd9ae07
Simplify blacklist paths.
nicolasstucki Jan 5, 2017
783a80d
Add useExplicitWhiteList for debugging.
nicolasstucki Jan 11, 2017
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
9 changes: 2 additions & 7 deletions bench/test/dotty/tools/benchmarks/Benchmarks.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dotty.tools.benchmarks

import dotty.tools.StdLibSources
import org.scalameter.Key.reports._
import org.scalameter.PerformanceTest.OnlineRegressionReport
import org.scalameter.api._
Expand Down Expand Up @@ -47,13 +48,7 @@ object BenchTests extends OnlineRegressionReport {

val dottyDir = "../compiler/src/dotty/"

val stdlibFiles = Source.fromFile("../compiler/test/dotc/scala-collections.whitelist", "UTF8").getLines()
.map(_.trim) // allow identation
.filter(!_.startsWith("#")) // allow comment lines prefixed by #
.map(_.takeWhile(_ != '#').trim) // allow comments in the end of line
.filter(_.nonEmpty)
.map("." + _)
.toList
val stdlibFiles = StdLibSources.whitelisted

def stdLib = compiler.compileList("compileStdLib", stdlibFiles, "-migration" :: scala2mode)

Expand Down
36 changes: 18 additions & 18 deletions compiler/test/dotc/scala-collections.blacklist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,83 @@
## Errors having to do with bootstrap

../scala-scala/src/library/scala/Function1.scala
../scala-scala/src/library/scala/Function2.scala
scala/Function1.scala
scala/Function2.scala
# Cyclic reference because of @specialized annotation


## Errors having to do with deep subtypes

../scala-scala/src/library/scala/collection/generic/ParSetFactory.scala
scala/collection/generic/ParSetFactory.scala
# This gives a deep subtype violation when run with the rest of the whitelist.
# Works without -Yno-deep-subtypes, though.

../scala-scala/src/library/scala/collection/parallel/mutable/ParMap.scala
scala/collection/parallel/mutable/ParMap.scala
# -Yno-deep-subtypes fails

../scala-scala/src/library/scala/collection/parallel/ParMap.scala
scala/collection/parallel/ParMap.scala
# -Yno-deep-subtypes fails

../scala-scala/src/library/scala/collection/parallel/ParMapLike.scala
scala/collection/parallel/ParMapLike.scala
# -Yno-deep-subtypes fails



## Ycheck failures, presumably linked to TailCalls

../scala-scala/src/library/scala/collection/parallel/ParIterableLike.scala
scala/collection/parallel/ParIterableLike.scala
# -Ycheck:classOf fails

../scala-scala/src/library/scala/collection/parallel/ParSeqLike.scala
scala/collection/parallel/ParSeqLike.scala
# -Ycheck:classOf fails

../scala-scala/src/library/scala/util/control/TailCalls.scala
scala/util/control/TailCalls.scala
# -Ycheck:classOf fails



## Errors having to do with unavailable APIs or language features:

../scala-scala/src/library/scala/reflect/ClassManifestDeprecatedApis.scala
scala/reflect/ClassManifestDeprecatedApis.scala
# 51 | import Manifest._
# | ^^^^^^^^
# | not found: Manifest

../scala-scala/src/library/scala/reflect/ClassTag.scala
scala/reflect/ClassTag.scala
# 124 | val Short : ClassTag[scala.Short] = Manifest.Short
# | ^^^^^^^^
# | not found: Manifest

../scala-scala/src/library/scala/reflect/Manifest.scala
scala/reflect/Manifest.scala
# 104 | private def readResolve(): Any = Manifest.Short
# | ^^^^^^^^
# | not found: Manifest

../scala-scala/src/library/scala/text/Document.scala
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-scala/src/library/scala/AnyVal.scala
scala/AnyVal.scala
# 55 |abstract class AnyVal extends Any {
# |^
# |illegal redefinition of standard class AnyVal
# (This is intended)

../scala-scala/src/library/scala/collection/parallel/Tasks.scala
scala/collection/parallel/Tasks.scala
# java.lang.StackOverflowError

../scala-scala/src/library/scala/reflect/package.scala
scala/reflect/package.scala
# 63 | private[scala] def materializeClassTag[T](): ClassTag[T] = macro ???
# | ^^^^^
# | not found: macro

../scala-scala/src/library/scala/StringContext.scala
scala/StringContext.scala
# 168 | def f[A >: Any](args: A*): String = macro ???
# | ^^^^^
# | not found: macro

../scala-scala/src/library/scala/util/control/Exception.scala
scala/util/control/Exception.scala
# 51 | implicit def throwableSubtypeToCatcher[Ex <: Throwable: ClassTag, T](pf: PartialFunction[Ex, T]) =
# | ^
# | cyclic reference involving method mkCatcher
Loading