From 81b7ed9abb9627d541b795990980f4431b459380 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 25 Nov 2015 00:07:13 +0100 Subject: 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. --- test/dotc/scala-collections.whitelist | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'test/dotc/scala-collections.whitelist') 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 -- cgit v1.2.3