diff options
| author | Richard Eisenberg <eir@cis.upenn.edu> | 2015-12-15 13:47:14 -0500 |
|---|---|---|
| committer | Richard Eisenberg <eir@cis.upenn.edu> | 2015-12-17 12:58:29 -0500 |
| commit | ae86eb9f72fa7220fe47ac54d6d21395691c1308 (patch) | |
| tree | 9a7158600971c7ae411ec0100459372689c3050f /testsuite | |
| parent | 1b6323b3ad576ef1806170d8cea871038b51de5e (diff) | |
| download | haskell-ae86eb9f72fa7220fe47ac54d6d21395691c1308.tar.gz | |
Fix tcTyClTyVars to handle SigTvs
Previously, tcTyClTyVars required that the names of the LHsQTyVars
matched up exactly with the names of the kind of the given TyCon.
It now does a bit of matching up when necessary to relax this
restriction.
This commit enables a few tests that had previously been disabled.
The shortcoming this addresses is discussed in #11203, but that
ticket is not directly addressed here.
Test case: polykinds/SigTvKinds, perf/compiler/T9872d
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/perf/compiler/all.T | 12 | ||||
| -rw-r--r-- | testsuite/tests/polykinds/all.T | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T index 184628ab16..42f2bc9c16 100644 --- a/testsuite/tests/perf/compiler/all.T +++ b/testsuite/tests/perf/compiler/all.T @@ -694,19 +694,17 @@ test('T9872c', ['']) test('T9872d', [ only_ways(['normal']), - expect_broken(11203), - # compiler_stats_num_field('bytes allocated', - # [(wordsize(64), 59651432, 5), + compiler_stats_num_field('bytes allocated', + [(wordsize(64), 566134504, 5), # 2014-12-18 796071864 Initally created # 2014-12-18 739189056 Reduce type families even more eagerly # 2015-01-07 687562440 TrieMap leaf compression # 2015-03-17 726679784 tweak to solver; probably flattens more - # (wordsize(32), 59651432, 5) + (wordsize(32), 59651432, 5) # some date 328810212 # 2015-07-11 350369584 - # 2015-12-11 59651432 Massive improvement from TypeInType - # but see also #11196 - # ]), + # 2015-12-11 566134504 TypeInType; see #11196 + ]), ], compile, ['']) diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T index 0005abc87d..d0aa124b90 100644 --- a/testsuite/tests/polykinds/all.T +++ b/testsuite/tests/polykinds/all.T @@ -124,6 +124,6 @@ test('T10134', normal, multimod_compile, ['T10134.hs','-v0']) test('T10742', normal, compile, ['']) test('T10934', normal, compile, ['']) test('T11142', normal, compile_fail, ['']) -test('SigTvKinds', expect_broken(11203), compile, ['']) +test('SigTvKinds', normal, compile, ['']) test('SigTvKinds2', expect_broken(11203), compile_fail, ['']) test('T9017', normal, compile_fail, ['']) |