diff options
author | Alan Zimmerman <alan.zimm@gmail.com> | 2020-09-07 21:50:39 +0100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-09 11:20:03 -0400 |
commit | 7911d0d983a68eb0d54d7c1ba51326d6be737aae (patch) | |
tree | a099770f0b3e38ff6883b8a6d8c93035512af7b4 /testsuite/tests | |
parent | ffae57921168365272bf7ce8aaa645917bfdf218 (diff) | |
download | haskell-7911d0d983a68eb0d54d7c1ba51326d6be737aae.tar.gz |
Remove GENERATED pragma, as it is not being used
@alanz pointed out on ghc-devs that the payload of this pragma does
not appear to be used anywhere.
I (@bgamari) did some digging and traced the pragma's addition back to
d386e0d2 (way back in 2006!).
It appears that it was intended to be used by code generators for use
in informing the code coveraging checker about generated code
provenance. When it was added it used the pragma's "payload" fields as
source location information to build an "ExternalBox". However, it
looks like this was dropped a year later in 55a5d8d9. At this point
it seems like the pragma serves no useful purpose.
Given that it also is not documented, I think we should remove it.
Updates haddock submodule
Closes #18639
Diffstat (limited to 'testsuite/tests')
-rw-r--r-- | testsuite/tests/ghc-api/annotations/T10313.stdout | 3 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/annotations/T11430.stdout | 1 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/annotations/Test10313.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/annotations/Test11430.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/annotations/stringSource.hs | 1 | ||||
-rw-r--r-- | testsuite/tests/ghc-api/annotations/t11430.hs | 1 | ||||
-rw-r--r-- | testsuite/tests/printer/Makefile | 4 | ||||
-rw-r--r-- | testsuite/tests/printer/Ppr047.hs | 3 | ||||
-rw-r--r-- | testsuite/tests/printer/all.T | 1 |
9 files changed, 1 insertions, 17 deletions
diff --git a/testsuite/tests/ghc-api/annotations/T10313.stdout b/testsuite/tests/ghc-api/annotations/T10313.stdout index 29fa705666..a85e849548 100644 --- a/testsuite/tests/ghc-api/annotations/T10313.stdout +++ b/testsuite/tests/ghc-api/annotations/T10313.stdout @@ -10,5 +10,4 @@ ([c], [(SourceText "foo\x63", fooc), (SourceText "b\x61r", bar)]), ([r], [(SourceText "foo1\x67", foo1g)]), ([s, t], [(SourceText "a\x62", ab)]), - ([s, c], [(SourceText "foo\x64", food)]), - ([t, p], [(SourceText "foob\x61r", foobar)])] + ([s, c], [(SourceText "foo\x64", food)])] diff --git a/testsuite/tests/ghc-api/annotations/T11430.stdout b/testsuite/tests/ghc-api/annotations/T11430.stdout index 157c29bb06..528e1e3d57 100644 --- a/testsuite/tests/ghc-api/annotations/T11430.stdout +++ b/testsuite/tests/ghc-api/annotations/T11430.stdout @@ -3,4 +3,3 @@ ("ia",["1"]) ("ia",["0x999"]) ("ia",["1"]) -("tp",["((SourceText \"0x1\",SourceText \"0x2\"),(SourceText \"0x3\",SourceText \"0x4\"))"]) diff --git a/testsuite/tests/ghc-api/annotations/Test10313.hs b/testsuite/tests/ghc-api/annotations/Test10313.hs index b8ed962a62..a94c9eac91 100644 --- a/testsuite/tests/ghc-api/annotations/Test10313.hs +++ b/testsuite/tests/ghc-api/annotations/Test10313.hs @@ -33,5 +33,3 @@ strictStream (Bitstream l v) Exact l b = {-# SCC "foo\x64" #-} 006 - -c = {-# GENERATED "foob\x61r" 1 : 2 - 3 : 4 #-} 0.00 diff --git a/testsuite/tests/ghc-api/annotations/Test11430.hs b/testsuite/tests/ghc-api/annotations/Test11430.hs index 4b124e478c..19b8e54ccd 100644 --- a/testsuite/tests/ghc-api/annotations/Test11430.hs +++ b/testsuite/tests/ghc-api/annotations/Test11430.hs @@ -21,5 +21,3 @@ x = undefined {-# INLINABLE [1] y #-} y :: (Num a, Integral b) => a -> b -> a y = undefined - -c = {-# GENERATED "foob\x61r" 0x1 : 0x2 - 0x3 : 0x4 #-} 0.00 diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs index 7c35c88996..e281186dc9 100644 --- a/testsuite/tests/ghc-api/annotations/stringSource.hs +++ b/testsuite/tests/ghc-api/annotations/stringSource.hs @@ -86,7 +86,6 @@ testOneFile libdir fileName = do doPragE :: HsPragE GhcPs -> [(String,[Located (SourceText,FastString)])] doPragE (HsPragSCC _ src ss) = [("sc",[conv (noLoc ss)])] - doPragE (HsPragTick _ src (ss,_,_) _ss2) = [("tp",[conv (noLoc ss)])] conv (GHC.L l (StringLiteral st fs)) = GHC.L l (st,fs) diff --git a/testsuite/tests/ghc-api/annotations/t11430.hs b/testsuite/tests/ghc-api/annotations/t11430.hs index c7f5801d59..a3a76dda96 100644 --- a/testsuite/tests/ghc-api/annotations/t11430.hs +++ b/testsuite/tests/ghc-api/annotations/t11430.hs @@ -68,7 +68,6 @@ testOneFile libdir fileName = do doRuleDecl (HsRule _ _ _ _ _ _ _) = [] doHsExpr :: HsExpr GhcPs -> [(String,[String])] - doHsExpr (HsPragE _ (HsPragTick _ src (_,_,_) ss) _) = [("tp",[show ss])] doHsExpr _ = [] doInline (InlinePragma _ _ _ (ActiveBefore (SourceText ss) _) _) diff --git a/testsuite/tests/printer/Makefile b/testsuite/tests/printer/Makefile index 044e44332e..f1199f3acf 100644 --- a/testsuite/tests/printer/Makefile +++ b/testsuite/tests/printer/Makefile @@ -190,10 +190,6 @@ ppr045: ppr046: $(CHECK_PPR) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Ppr046.hs -.PHONY: ppr047 -ppr047: - $(CHECK_PPR) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Ppr047.hs - .PHONY: ppr048 ppr048: $(CHECK_PPR) "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`" Ppr048.hs diff --git a/testsuite/tests/printer/Ppr047.hs b/testsuite/tests/printer/Ppr047.hs deleted file mode 100644 index e7f36850b0..0000000000 --- a/testsuite/tests/printer/Ppr047.hs +++ /dev/null @@ -1,3 +0,0 @@ -module ExprPragmas where - -c = {-# GENERATED "foobar" 1 : 2 - 3 : 4 #-} 0.00 diff --git a/testsuite/tests/printer/all.T b/testsuite/tests/printer/all.T index 597f83aa9c..9e62577855 100644 --- a/testsuite/tests/printer/all.T +++ b/testsuite/tests/printer/all.T @@ -44,7 +44,6 @@ test('Ppr043', [ignore_stderr, req_interp], makefile_test, ['ppr043']) test('Ppr044', ignore_stderr, makefile_test, ['ppr044']) test('Ppr045', ignore_stderr, makefile_test, ['ppr045']) test('Ppr046', ignore_stderr, makefile_test, ['ppr046']) -test('Ppr047', ignore_stderr, makefile_test, ['ppr047']) test('Ppr048', ignore_stderr, makefile_test, ['ppr048']) test('T13199', [ignore_stderr, req_interp], makefile_test, ['T13199']) test('T13050p', ignore_stderr, makefile_test, ['T13050p']) |