summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-05-17 10:34:09 +0100
committerZubin <zubin.duggal@gmail.com>2021-06-22 10:15:03 +0000
commit5b9846a51b599a076e651e19f8226b9043a202f0 (patch)
treecca99042116881980f0758d6e27f3230ad949709
parentaa3bbb77632b7371ef2b138f71e64ad16aa526b1 (diff)
downloadhaskell-wip/t19849-backport-9.2.tar.gz
Make setBndrsDemandInfo work with only type variableswip/t19849-backport-9.2
Fixes #19849 Co-authored-by: Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> (cherry picked from commit c4099b0908e3f4ae04312ca82af147eb1585cd09)
-rw-r--r--compiler/GHC/Core/Opt/DmdAnal.hs6
-rw-r--r--testsuite/tests/stranal/should_compile/T19849.hs7
-rw-r--r--testsuite/tests/stranal/should_compile/all.T1
3 files changed, 11 insertions, 3 deletions
diff --git a/compiler/GHC/Core/Opt/DmdAnal.hs b/compiler/GHC/Core/Opt/DmdAnal.hs
index eedc9b4489..7c168d1ed1 100644
--- a/compiler/GHC/Core/Opt/DmdAnal.hs
+++ b/compiler/GHC/Core/Opt/DmdAnal.hs
@@ -1233,9 +1233,9 @@ dictionaries.
-}
setBndrsDemandInfo :: [Var] -> [Demand] -> [Var]
-setBndrsDemandInfo (b:bs) (d:ds)
- | isTyVar b = b : setBndrsDemandInfo bs (d:ds)
- | otherwise = setIdDemandInfo b d : setBndrsDemandInfo bs ds
+setBndrsDemandInfo (b:bs) ds
+ | isTyVar b = b : setBndrsDemandInfo bs ds
+setBndrsDemandInfo (b:bs) (d:ds) = setIdDemandInfo b d : setBndrsDemandInfo bs ds
setBndrsDemandInfo [] ds = ASSERT( null ds ) []
setBndrsDemandInfo bs _ = pprPanic "setBndrsDemandInfo" (ppr bs)
diff --git a/testsuite/tests/stranal/should_compile/T19849.hs b/testsuite/tests/stranal/should_compile/T19849.hs
new file mode 100644
index 0000000000..9fa50ef001
--- /dev/null
+++ b/testsuite/tests/stranal/should_compile/T19849.hs
@@ -0,0 +1,7 @@
+module T19849 where
+
+data T where
+ C :: forall k. T
+
+f :: T -> ()
+f C = ()
diff --git a/testsuite/tests/stranal/should_compile/all.T b/testsuite/tests/stranal/should_compile/all.T
index 3e77a602ae..61e9c58dee 100644
--- a/testsuite/tests/stranal/should_compile/all.T
+++ b/testsuite/tests/stranal/should_compile/all.T
@@ -66,3 +66,4 @@ test('T18894b', [ grep_errmsg(r'Arity=2') ], compile, ['-ddump-stranal -dsuppre
test('T18982', [ grep_errmsg(r'\$w. .*Int#$') ], compile, ['-dppr-cols=1000 -ddump-simpl -dsuppress-idinfo -dsuppress-uniques'])
test('T19180', normal, compile, [''])
+test('T19849', normal, compile, [''])