aboutsummaryrefslogtreecommitdiff
path: root/test/dotc/scala-collections.whitelist
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2015-11-25 00:07:13 +0100
committerGuillaume Martres <smarter@ubuntu.com>2015-11-25 02:11:17 +0100
commit81b7ed9abb9627d541b795990980f4431b459380 (patch)
tree86b9976cdcaee86082e9d8c35ed24fe59d9c2cc3 /test/dotc/scala-collections.whitelist
parent4463f5e705480c7da188695abdb0ccacf452103c (diff)
downloaddotty-81b7ed9abb9627d541b795990980f4431b459380.tar.gz
dotty-81b7ed9abb9627d541b795990980f4431b459380.tar.bz2
dotty-81b7ed9abb9627d541b795990980f4431b459380.zip
isSubtype: try to dealias TypeRefs before recursively checking the prefixes
As demonstrated by tests/pos/hk-deep-subtype.scala, we can avoid some deep subtype recursions that result in stack overflows by doing this. Fix #943.
Diffstat (limited to 'test/dotc/scala-collections.whitelist')
-rw-r--r--test/dotc/scala-collections.whitelist9
1 files changed, 3 insertions, 6 deletions
diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist
index a758f9a8c..25cd73629 100644
--- a/test/dotc/scala-collections.whitelist
+++ b/test/dotc/scala-collections.whitelist
@@ -263,16 +263,13 @@
./scala-scala/src/library/scala/collection/generic/GenericSeqCompanion.scala
./scala-scala/src/library/scala/collection/generic/GenericSetTemplate.scala
-# deep subtype
-#./scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala
+./scala-scala/src/library/scala/collection/generic/GenericTraversableTemplate.scala
./scala-scala/src/library/scala/collection/generic/HasNewBuilder.scala
./scala-scala/src/library/scala/collection/generic/HasNewCombiner.scala
-# https://github.com/lampepfl/dotty/issues/943
-# [error] Test dotc.tests.compileStdLib failed: java.lang.Error: deep subtype, took 6.462 sec
-#./scala-scala/src/library/scala/collection/generic/ImmutableMapFactory.scala
-#./scala-scala/src/library/scala/collection/generic/ImmutableSetFactory.scala
+./scala-scala/src/library/scala/collection/generic/ImmutableMapFactory.scala
+./scala-scala/src/library/scala/collection/generic/ImmutableSetFactory.scala
./scala-scala/src/library/scala/collection/generic/ImmutableSortedMapFactory.scala
./scala-scala/src/library/scala/collection/generic/ImmutableSortedSetFactory.scala