summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorRichard Eisenberg <rae@richarde.dev>2019-06-04 14:31:08 -0400
committerAlp Mestanogullari <alp@well-typed.com>2019-08-14 17:47:25 -0400
commit6329c70a36242849540c93b34903f6188b0ed477 (patch)
treef341da692c9f7707be90939f9e890f28625d5402 /testsuite
parentaa4d8b07edad74c29acdcf06cf1b4c3ff6b97ffa (diff)
downloadhaskell-6329c70a36242849540c93b34903f6188b0ed477.tar.gz
GHCi supports not-necessarily-lifted join points
Fixes #16509. See Note [Not-necessarily-lifted join points] in ByteCodeGen, which tells the full story. This commit also adds some comments and cleans some code in the byte-code generator, as I was exploring around trying to understand it. (This commit removes an old test -- this is really a GHCi problem, not a pattern-synonym problem.) test case: ghci/scripts/T16509
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/ghci/scripts/T16509.hs (renamed from testsuite/tests/patsyn/should_compile/T16509.hs)1
-rw-r--r--testsuite/tests/ghci/scripts/T16509.script1
-rwxr-xr-xtestsuite/tests/ghci/scripts/all.T1
-rw-r--r--testsuite/tests/patsyn/should_compile/T16509.script1
-rw-r--r--testsuite/tests/patsyn/should_compile/all.T1
5 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/tests/patsyn/should_compile/T16509.hs b/testsuite/tests/ghci/scripts/T16509.hs
index b848811119..6f35e3c792 100644
--- a/testsuite/tests/patsyn/should_compile/T16509.hs
+++ b/testsuite/tests/ghci/scripts/T16509.hs
@@ -9,4 +9,3 @@ pattern TestPat <- (isSameRef -> True, 0)
isSameRef :: Int -> Bool
isSameRef e | 0 <- e = True
isSameRef _ = False
-
diff --git a/testsuite/tests/ghci/scripts/T16509.script b/testsuite/tests/ghci/scripts/T16509.script
new file mode 100644
index 0000000000..3e40de0b91
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/T16509.script
@@ -0,0 +1 @@
+:l T16509
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index 8448e3f012..609cbf0592 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -301,5 +301,6 @@ test('T16563', extra_hc_opts("-clear-package-db -global-package-db"), ghci_scrip
test('T16569', normal, ghci_script, ['T16569.script'])
test('T16767', normal, ghci_script, ['T16767.script'])
test('T16575', normal, ghci_script, ['T16575.script'])
+test('T16509', normal, ghci_script, ['T16509.script'])
test('T16804', extra_files(['T16804a.hs', 'T16804b.hs']), ghci_script, ['T16804.script'])
test('T15546', normal, ghci_script, ['T15546.script'])
diff --git a/testsuite/tests/patsyn/should_compile/T16509.script b/testsuite/tests/patsyn/should_compile/T16509.script
deleted file mode 100644
index fd4714a9b5..0000000000
--- a/testsuite/tests/patsyn/should_compile/T16509.script
+++ /dev/null
@@ -1 +0,0 @@
-:load T16509.hs
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index 15369b657e..2ac343f635 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -77,6 +77,5 @@ test('T14326', normal, compile, [''])
test('T14394', normal, ghci_script, ['T14394.script'])
test('T14552', normal, compile, [''])
test('T14498', normal, compile, [''])
-test('T16509', expect_broken(16509), ghci_script, ['T16509.script'])
test('T16682', [extra_files(['T16682.hs', 'T16682a.hs'])],
multimod_compile, ['T16682', '-v0 -fwarn-incomplete-patterns -fno-code'])