diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-01-03 15:53:43 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-01-18 16:12:50 -0500 |
| commit | 310424d05836ee8788c7c79f98243ef92330f5f1 (patch) | |
| tree | b40ca68ef5807c92dcce745081ac6bc4011f1d65 /testsuite/tests/ghci | |
| parent | 18c797b80b938b648704f118dacbfe8655aaeea5 (diff) | |
| download | haskell-310424d05836ee8788c7c79f98243ef92330f5f1.tar.gz | |
Correct type of static forms in hsExprType
The simplest way to do this seemed to be to persist the whole type in
the extension field from the typechecker so that the few relevant places
* Desugaring can work out the return type by splitting this type rather
than calling `dsExpr` (slightly more efficient).
* hsExprType can just return the correct type.
* Zonking has to now zonk the type as well
The other option we considered was wiring in StaticPtr but that is
actually quite tricky because StaticPtr refers to StaticPtrInfo which
has field selectors (which we can't easily wire in).
Fixes #20150
Diffstat (limited to 'testsuite/tests/ghci')
| -rw-r--r-- | testsuite/tests/ghci/scripts/T20150.hs | 9 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T20150.script | 3 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T20150.stdout | 6 | ||||
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 1 |
4 files changed, 19 insertions, 0 deletions
diff --git a/testsuite/tests/ghci/scripts/T20150.hs b/testsuite/tests/ghci/scripts/T20150.hs new file mode 100644 index 0000000000..e1706dedc4 --- /dev/null +++ b/testsuite/tests/ghci/scripts/T20150.hs @@ -0,0 +1,9 @@ +{-# LANGUAGE StaticPointers #-} +module T20150 where + +import GHC.StaticPtr + +foo :: StaticPtr Int +foo = static 0 + + diff --git a/testsuite/tests/ghci/scripts/T20150.script b/testsuite/tests/ghci/scripts/T20150.script new file mode 100644 index 0000000000..0b5d132cdd --- /dev/null +++ b/testsuite/tests/ghci/scripts/T20150.script @@ -0,0 +1,3 @@ +:set +c +:l T20150.hs +:all-types diff --git a/testsuite/tests/ghci/scripts/T20150.stdout b/testsuite/tests/ghci/scripts/T20150.stdout new file mode 100644 index 0000000000..e55ee89ea9 --- /dev/null +++ b/testsuite/tests/ghci/scripts/T20150.stdout @@ -0,0 +1,6 @@ +Collecting type info for 1 module(s) ... +T20150.hs:(7,1)-(7,3): GHC.StaticPtr.StaticPtr GHC.Types.Int +T20150.hs:(7,14)-(7,14): GHC.Types.Int +T20150.hs:(7,7)-(7,14): GHC.StaticPtr.StaticPtr GHC.Types.Int +T20150.hs:(7,7)-(7,14): GHC.StaticPtr.StaticPtr GHC.Types.Int -> GHC.StaticPtr.StaticPtr GHC.Types.Int +T20150.hs:(7,7)-(7,14): GHC.StaticPtr.StaticPtr GHC.Types.Int diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index 5e9aea056d..71e0ea80a5 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -354,3 +354,4 @@ test('T20473b', normal, ghci_script, ['T20473b.script']) test('T20587', [extra_files(['../shell.hs'])], ghci_script, ['T20587.script']) test('T20909', normal, ghci_script, ['T20909.script']) +test('T20150', normal, ghci_script, ['T20150.script']) |