ApiAnnotations: misplaced AnnComma for squals production

Summary:
The parser production for squals has

    : squals ',' transformqual
             {% addAnnotation (gl $ last $ unLoc $1) AnnComma (gl $2) >>
                ams (sLL $1 $> ()) (fst $ unLoc $3) >>
                return (sLL $1 $> [sLL $1 $> ((snd $ unLoc $3) (reverse (unLoc $1)))]) }

This attaches the comma to the wrong part of the squals, as it is
generated in reverse order.

Test Plan: ./validate

Reviewers: hvr, austin

Reviewed By: austin

Subscribers: bgamari, thomie, mpickering

Differential Revision: https://phabricator.haskell.org/D846

GHC Trac Issues: #10312

(cherry picked from commit 713612674634754edd17264e688f0479d943d8d2)

8 files changed, 689 insertions, 1 deletions

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 9645e3a9f9..0f185def25 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -2337,7 +2337,7 @@ pquals :: { Located [[LStmt RdrName (LHsExpr RdrName)]] }
 squals :: { Located [LStmt RdrName (LHsExpr RdrName)] }   -- In reverse order, because the last
                                         -- one can "grab" the earlier ones
     : squals ',' transformqual
-             {% addAnnotation (gl $ last $ unLoc $1) AnnComma (gl $2) >>
+             {% addAnnotation (gl $ head $ unLoc $1) AnnComma (gl $2) >>
                 ams (sLL $1 $> ()) (fst $ unLoc $3) >>
                 return (sLL $1 $> [sLL $1 $> ((snd $ unLoc $3) (reverse (unLoc $1)))]) }
     | squals ',' qual
diff --git a/testsuite/tests/ghc-api/annotations/.gitignore b/testsuite/tests/ghc-api/annotations/.gitignore
index fc9760fb89..41b32acb65 100644
--- a/testsuite/tests/ghc-api/annotations/.gitignore
+++ b/testsuite/tests/ghc-api/annotations/.gitignore
@@ -7,6 +7,7 @@ t10255
 t10268
 t10269
 t10280
+t10312
 *.hi
 *.o
 *.run.*
diff --git a/testsuite/tests/ghc-api/annotations/Makefile b/testsuite/tests/ghc-api/annotations/Makefile
index 44b28891cb..1f03afc5ea 100644
--- a/testsuite/tests/ghc-api/annotations/Makefile
+++ b/testsuite/tests/ghc-api/annotations/Makefile
@@ -6,6 +6,7 @@ clean:
 	rm -f *.o *.hi
 	rm -f annotations comments parseTree exampleTest
 	rm -f t10269
+	rm -f t10255 t10312
 
 annotations: 
 	rm -f annotations.o annotations.hi
@@ -57,3 +58,10 @@ T10269:
 	./t10269 "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
 
 .PHONY: t10269
+
+t10312:
+	rm -f t10312.o t10312.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc t10312
+	./t10312 "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
+
+.PHONY: clean annotations parseTree comments exampleTest listcomps t10255 t10312
diff --git a/testsuite/tests/ghc-api/annotations/T10312.stderr b/testsuite/tests/ghc-api/annotations/T10312.stderr
new file mode 100644
index 0000000000..08f3bec6cf
--- /dev/null
+++ b/testsuite/tests/ghc-api/annotations/T10312.stderr
@@ -0,0 +1,8 @@
+
+Test10312.hs:77:38: error: Not in scope: data constructor ‘Fixity’
+
+Test10312.hs:77:53: error:
+    Not in scope: ‘fs’
+    Perhaps you meant ‘fst’ (imported from Prelude)
+
+Test10312.hs:78:47: error: Not in scope: ‘ppDir’
diff --git a/testsuite/tests/ghc-api/annotations/T10312.stdout b/testsuite/tests/ghc-api/annotations/T10312.stdout
new file mode 100644
index 0000000000..5e4fd1c68e
--- /dev/null
+++ b/testsuite/tests/ghc-api/annotations/T10312.stdout
@@ -0,0 +1,485 @@
+---Problems---------------------
+[
+]
+
+--------------------------------
+[
+(AK Test10312.hs:1:1 AnnModule = [Test10312.hs:4:1-6])
+
+(AK Test10312.hs:1:1 AnnWhere = [Test10312.hs:4:18-22])
+
+(AK Test10312.hs:8:1-15 AnnImport = [Test10312.hs:8:1-6])
+
+(AK Test10312.hs:8:1-15 AnnSemi = [Test10312.hs:9:1])
+
+(AK Test10312.hs:9:1-30 AnnAs = [Test10312.hs:9:27-28])
+
+(AK Test10312.hs:9:1-30 AnnImport = [Test10312.hs:9:1-6])
+
+(AK Test10312.hs:9:1-30 AnnQualified = [Test10312.hs:9:8-16])
+
+(AK Test10312.hs:9:1-30 AnnSemi = [Test10312.hs:10:1])
+
+(AK Test10312.hs:9:1-30 AnnVal = [Test10312.hs:9:30])
+
+(AK Test10312.hs:10:1-27 AnnImport = [Test10312.hs:10:1-6])
+
+(AK Test10312.hs:10:1-27 AnnSemi = [Test10312.hs:11:1])
+
+(AK Test10312.hs:10:17-27 AnnCloseP = [Test10312.hs:10:27])
+
+(AK Test10312.hs:10:17-27 AnnOpenP = [Test10312.hs:10:17])
+
+(AK Test10312.hs:11:1-25 AnnImport = [Test10312.hs:11:1-6])
+
+(AK Test10312.hs:11:1-25 AnnSemi = [Test10312.hs:15:1])
+
+(AK Test10312.hs:11:18-25 AnnCloseP = [Test10312.hs:11:25])
+
+(AK Test10312.hs:11:18-25 AnnOpenP = [Test10312.hs:11:18])
+
+(AK Test10312.hs:15:1-24 AnnDcolon = [Test10312.hs:15:17-18])
+
+(AK Test10312.hs:15:1-24 AnnSemi = [Test10312.hs:16:1])
+
+(AK Test10312.hs:15:20-24 AnnCloseS = [Test10312.hs:15:24])
+
+(AK Test10312.hs:15:20-24 AnnOpenS = [Test10312.hs:15:20])
+
+(AK Test10312.hs:(16,1)-(20,19) AnnEqual = [Test10312.hs:16:17])
+
+(AK Test10312.hs:(16,1)-(20,19) AnnFunId = [Test10312.hs:16:1-15])
+
+(AK Test10312.hs:(16,1)-(20,19) AnnSemi = [Test10312.hs:22:1])
+
+(AK Test10312.hs:(16,19)-(20,19) AnnCloseS = [Test10312.hs:20:19])
+
+(AK Test10312.hs:(16,19)-(20,19) AnnOpenS = [Test10312.hs:16:19])
+
+(AK Test10312.hs:(16,19)-(20,19) AnnVbar = [Test10312.hs:17:19])
+
+(AK Test10312.hs:16:21-25 AnnVal = [Test10312.hs:16:23])
+
+(AK Test10312.hs:16:21-29 AnnVal = [Test10312.hs:16:27])
+
+(AK Test10312.hs:17:21-32 AnnComma = [Test10312.hs:18:19])
+
+(AK Test10312.hs:17:21-32 AnnLarrow = [Test10312.hs:17:23-24])
+
+(AK Test10312.hs:17:26-32 AnnCloseS = [Test10312.hs:17:32])
+
+(AK Test10312.hs:17:26-32 AnnDotdot = [Test10312.hs:17:28-29])
+
+(AK Test10312.hs:17:26-32 AnnOpenS = [Test10312.hs:17:26])
+
+(AK Test10312.hs:18:21-33 AnnComma = [Test10312.hs:19:19])
+
+(AK Test10312.hs:18:21-33 AnnLarrow = [Test10312.hs:18:23-24])
+
+(AK Test10312.hs:18:26-33 AnnCloseS = [Test10312.hs:18:33])
+
+(AK Test10312.hs:18:26-33 AnnDotdot = [Test10312.hs:18:29-30])
+
+(AK Test10312.hs:18:26-33 AnnOpenS = [Test10312.hs:18:26])
+
+(AK Test10312.hs:19:21-33 AnnLarrow = [Test10312.hs:19:23-24])
+
+(AK Test10312.hs:19:26-33 AnnCloseS = [Test10312.hs:19:33])
+
+(AK Test10312.hs:19:26-33 AnnDotdot = [Test10312.hs:19:29-30])
+
+(AK Test10312.hs:19:26-33 AnnOpenS = [Test10312.hs:19:26])
+
+(AK Test10312.hs:22:1-25 AnnDcolon = [Test10312.hs:22:18-19])
+
+(AK Test10312.hs:22:1-25 AnnSemi = [Test10312.hs:23:1])
+
+(AK Test10312.hs:22:21-25 AnnCloseS = [Test10312.hs:22:25])
+
+(AK Test10312.hs:22:21-25 AnnOpenS = [Test10312.hs:22:21])
+
+(AK Test10312.hs:(23,1)-(27,20) AnnEqual = [Test10312.hs:23:18])
+
+(AK Test10312.hs:(23,1)-(27,20) AnnFunId = [Test10312.hs:23:1-16])
+
+(AK Test10312.hs:(23,1)-(27,20) AnnSemi = [Test10312.hs:32:1])
+
+(AK Test10312.hs:(23,20)-(27,20) AnnCloseS = [Test10312.hs:27:20])
+
+(AK Test10312.hs:(23,20)-(27,20) AnnOpenS = [Test10312.hs:23:20])
+
+(AK Test10312.hs:(23,20)-(27,20) AnnVbar = [Test10312.hs:24:20])
+
+(AK Test10312.hs:23:22-26 AnnVal = [Test10312.hs:23:24])
+
+(AK Test10312.hs:23:22-30 AnnVal = [Test10312.hs:23:28])
+
+(AK Test10312.hs:24:22-33 AnnLarrow = [Test10312.hs:24:24-25])
+
+(AK Test10312.hs:24:22-33 AnnVbar = [Test10312.hs:25:20])
+
+(AK Test10312.hs:24:27-33 AnnCloseS = [Test10312.hs:24:33])
+
+(AK Test10312.hs:24:27-33 AnnDotdot = [Test10312.hs:24:29-30])
+
+(AK Test10312.hs:24:27-33 AnnOpenS = [Test10312.hs:24:27])
+
+(AK Test10312.hs:25:22-34 AnnLarrow = [Test10312.hs:25:24-25])
+
+(AK Test10312.hs:25:22-34 AnnVbar = [Test10312.hs:26:20])
+
+(AK Test10312.hs:25:27-34 AnnCloseS = [Test10312.hs:25:34])
+
+(AK Test10312.hs:25:27-34 AnnDotdot = [Test10312.hs:25:30-31])
+
+(AK Test10312.hs:25:27-34 AnnOpenS = [Test10312.hs:25:27])
+
+(AK Test10312.hs:26:22-34 AnnLarrow = [Test10312.hs:26:24-25])
+
+(AK Test10312.hs:26:27-34 AnnCloseS = [Test10312.hs:26:34])
+
+(AK Test10312.hs:26:27-34 AnnDotdot = [Test10312.hs:26:30-31])
+
+(AK Test10312.hs:26:27-34 AnnOpenS = [Test10312.hs:26:27])
+
+(AK Test10312.hs:32:1-13 AnnDcolon = [Test10312.hs:32:6-7])
+
+(AK Test10312.hs:32:1-13 AnnSemi = [Test10312.hs:33:1])
+
+(AK Test10312.hs:32:9-13 AnnCloseS = [Test10312.hs:32:13])
+
+(AK Test10312.hs:32:9-13 AnnOpenS = [Test10312.hs:32:9])
+
+(AK Test10312.hs:(33,1)-(36,16) AnnEqual = [Test10312.hs:33:6])
+
+(AK Test10312.hs:(33,1)-(36,16) AnnFunId = [Test10312.hs:33:1-4])
+
+(AK Test10312.hs:(33,1)-(36,16) AnnSemi = [Test10312.hs:38:1])
+
+(AK Test10312.hs:33:8-12 AnnVal = [Test10312.hs:33:10])
+
+(AK Test10312.hs:(33,8)-(36,16) AnnVal = [Test10312.hs:33:14])
+
+(AK Test10312.hs:(33,16)-(36,16) AnnCloseS = [Test10312.hs:36:16])
+
+(AK Test10312.hs:(33,16)-(36,16) AnnOpenS = [Test10312.hs:33:16])
+
+(AK Test10312.hs:(33,16)-(36,16) AnnVbar = [Test10312.hs:34:16])
+
+(AK Test10312.hs:33:18-22 AnnVal = [Test10312.hs:33:20])
+
+(AK Test10312.hs:34:18-26 AnnLarrow = [Test10312.hs:34:20-21])
+
+(AK Test10312.hs:34:18-26 AnnVbar = [Test10312.hs:35:16])
+
+(AK Test10312.hs:35:18-31 AnnLarrow = [Test10312.hs:35:20-21])
+
+(AK Test10312.hs:38:1-17 AnnDcolon = [Test10312.hs:38:10-11])
+
+(AK Test10312.hs:38:1-17 AnnSemi = [Test10312.hs:39:1])
+
+(AK Test10312.hs:38:13-17 AnnCloseS = [Test10312.hs:38:17])
+
+(AK Test10312.hs:38:13-17 AnnOpenS = [Test10312.hs:38:13])
+
+(AK Test10312.hs:(39,1)-(43,20) AnnEqual = [Test10312.hs:39:10])
+
+(AK Test10312.hs:(39,1)-(43,20) AnnFunId = [Test10312.hs:39:1-8])
+
+(AK Test10312.hs:(39,1)-(43,20) AnnSemi = [Test10312.hs:46:1])
+
+(AK Test10312.hs:39:12-16 AnnVal = [Test10312.hs:39:14])
+
+(AK Test10312.hs:(39,12)-(43,20) AnnVal = [Test10312.hs:39:18])
+
+(AK Test10312.hs:(39,20)-(43,20) AnnCloseS = [Test10312.hs:43:20])
+
+(AK Test10312.hs:(39,20)-(43,20) AnnOpenS = [Test10312.hs:39:20])
+
+(AK Test10312.hs:(39,20)-(43,20) AnnVbar = [Test10312.hs:40:20])
+
+(AK Test10312.hs:39:22-26 AnnVal = [Test10312.hs:39:24])
+
+(AK Test10312.hs:39:22-30 AnnVal = [Test10312.hs:39:28])
+
+(AK Test10312.hs:40:22-30 AnnLarrow = [Test10312.hs:40:24-25])
+
+(AK Test10312.hs:40:22-30 AnnVbar = [Test10312.hs:41:20])
+
+(AK Test10312.hs:41:22-35 AnnLarrow = [Test10312.hs:41:24-25])
+
+(AK Test10312.hs:41:22-35 AnnVbar = [Test10312.hs:42:20])
+
+(AK Test10312.hs:42:22-42 AnnLarrow = [Test10312.hs:42:24-25])
+
+(AK Test10312.hs:42:32-42 AnnCloseP = [Test10312.hs:42:42])
+
+(AK Test10312.hs:42:32-42 AnnOpenP = [Test10312.hs:42:32])
+
+(AK Test10312.hs:(46,1)-(50,23) AnnData = [Test10312.hs:46:1-4])
+
+(AK Test10312.hs:(46,1)-(50,23) AnnEqual = [Test10312.hs:46:16])
+
+(AK Test10312.hs:(46,1)-(50,23) AnnSemi = [Test10312.hs:52:1])
+
+(AK Test10312.hs:(47,3)-(50,3) AnnCloseC = [Test10312.hs:50:3])
+
+(AK Test10312.hs:(47,3)-(50,3) AnnOpenC = [Test10312.hs:47:3])
+
+(AK Test10312.hs:47:5-23 AnnComma = [Test10312.hs:48:3])
+
+(AK Test10312.hs:47:5-23 AnnDcolon = [Test10312.hs:47:15-16])
+
+(AK Test10312.hs:48:5-22 AnnComma = [Test10312.hs:49:3])
+
+(AK Test10312.hs:48:5-22 AnnDcolon = [Test10312.hs:48:14-15])
+
+(AK Test10312.hs:49:5-20 AnnDcolon = [Test10312.hs:49:15-16])
+
+(AK Test10312.hs:50:5-23 AnnCloseP = [Test10312.hs:50:23])
+
+(AK Test10312.hs:50:5-23 AnnDeriving = [Test10312.hs:50:5-12])
+
+(AK Test10312.hs:50:5-23 AnnOpenP = [Test10312.hs:50:14])
+
+(AK Test10312.hs:50:15-18 AnnComma = [Test10312.hs:50:19])
+
+(AK Test10312.hs:52:1-22 AnnDcolon = [Test10312.hs:52:9-10])
+
+(AK Test10312.hs:52:1-22 AnnSemi = [Test10312.hs:53:1])
+
+(AK Test10312.hs:52:12-22 AnnCloseS = [Test10312.hs:52:22])
+
+(AK Test10312.hs:52:12-22 AnnOpenS = [Test10312.hs:52:12])
+
+(AK Test10312.hs:(53,1)-(59,11) AnnEqual = [Test10312.hs:53:9])
+
+(AK Test10312.hs:(53,1)-(59,11) AnnFunId = [Test10312.hs:53:1-7])
+
+(AK Test10312.hs:(53,1)-(59,11) AnnSemi = [Test10312.hs:61:1])
+
+(AK Test10312.hs:(53,11)-(59,11) AnnCloseS = [Test10312.hs:59:11])
+
+(AK Test10312.hs:(53,11)-(59,11) AnnOpenS = [Test10312.hs:53:11])
+
+(AK Test10312.hs:53:13-44 AnnComma = [Test10312.hs:54:11])
+
+(AK Test10312.hs:54:13-44 AnnComma = [Test10312.hs:55:11])
+
+(AK Test10312.hs:55:13-43 AnnComma = [Test10312.hs:56:11])
+
+(AK Test10312.hs:56:13-45 AnnComma = [Test10312.hs:57:11])
+
+(AK Test10312.hs:57:13-44 AnnComma = [Test10312.hs:58:11])
+
+(AK Test10312.hs:61:1-40 AnnDcolon = [Test10312.hs:61:8-9])
+
+(AK Test10312.hs:61:1-40 AnnSemi = [Test10312.hs:62:1])
+
+(AK Test10312.hs:61:11-40 AnnRarrow = [Test10312.hs:61:15-16])
+
+(AK Test10312.hs:61:18-28 AnnCloseS = [Test10312.hs:61:28])
+
+(AK Test10312.hs:61:18-28 AnnOpenS = [Test10312.hs:61:18])
+
+(AK Test10312.hs:61:18-40 AnnRarrow = [Test10312.hs:61:30-31])
+
+(AK Test10312.hs:61:33-40 AnnCloseS = [Test10312.hs:61:40])
+
+(AK Test10312.hs:61:33-40 AnnOpenS = [Test10312.hs:61:33])
+
+(AK Test10312.hs:(62,1)-(66,16) AnnEqual = [Test10312.hs:62:14])
+
+(AK Test10312.hs:(62,1)-(66,16) AnnFunId = [Test10312.hs:62:1-6])
+
+(AK Test10312.hs:(62,1)-(66,16) AnnSemi = [Test10312.hs:68:1])
+
+(AK Test10312.hs:(62,16)-(66,16) AnnCloseS = [Test10312.hs:66:16])
+
+(AK Test10312.hs:(62,16)-(66,16) AnnOpenS = [Test10312.hs:62:16])
+
+(AK Test10312.hs:(62,16)-(66,16) AnnVbar = [Test10312.hs:63:16])
+
+(AK Test10312.hs:62:18-33 AnnVal = [Test10312.hs:62:28-29])
+
+(AK Test10312.hs:62:18-45 AnnVal = [Test10312.hs:62:35-36])
+
+(AK Test10312.hs:63:18-30 AnnCloseC = [Test10312.hs:63:30])
+
+(AK Test10312.hs:63:18-30 AnnDotdot = [Test10312.hs:63:28-29])
+
+(AK Test10312.hs:63:18-30 AnnOpenC = [Test10312.hs:63:27])
+
+(AK Test10312.hs:63:18-37 AnnComma = [Test10312.hs:64:16])
+
+(AK Test10312.hs:63:18-37 AnnLarrow = [Test10312.hs:63:32-33])
+
+(AK Test10312.hs:(63,18)-(64,43) AnnBy = [Test10312.hs:64:32-33])
+
+(AK Test10312.hs:(63,18)-(64,43) AnnComma = [Test10312.hs:65:16])
+
+(AK Test10312.hs:(63,18)-(64,43) AnnThen = [Test10312.hs:64:18-21])
+
+(AK Test10312.hs:(63,18)-(65,28) AnnThen = [Test10312.hs:65:18-21])
+
+(AK Test10312.hs:68:1-51 AnnDcolon = [Test10312.hs:68:16-17])
+
+(AK Test10312.hs:68:1-51 AnnSemi = [Test10312.hs:69:1])
+
+(AK Test10312.hs:68:19-23 AnnDarrow = [Test10312.hs:68:25-26])
+
+(AK Test10312.hs:68:28-35 AnnCloseP = [Test10312.hs:68:35])
+
+(AK Test10312.hs:68:28-35 AnnOpenP = [Test10312.hs:68:28])
+
+(AK Test10312.hs:68:28-51 AnnRarrow = [Test10312.hs:68:37-38])
+
+(AK Test10312.hs:68:29-34 AnnRarrow = [Test10312.hs:68:31-32])
+
+(AK Test10312.hs:68:40-42 AnnCloseS = [Test10312.hs:68:42])
+
+(AK Test10312.hs:68:40-42 AnnOpenS = [Test10312.hs:68:40])
+
+(AK Test10312.hs:68:40-51 AnnRarrow = [Test10312.hs:68:44-45])
+
+(AK Test10312.hs:68:47-51 AnnCloseS = [Test10312.hs:68:51])
+
+(AK Test10312.hs:68:47-51 AnnOpenS = [Test10312.hs:68:47])
+
+(AK Test10312.hs:68:48-50 AnnCloseS = [Test10312.hs:68:50])
+
+(AK Test10312.hs:68:48-50 AnnOpenS = [Test10312.hs:68:48])
+
+(AK Test10312.hs:69:1-69 AnnEqual = [Test10312.hs:69:18])
+
+(AK Test10312.hs:69:1-69 AnnFunId = [Test10312.hs:69:1-14])
+
+(AK Test10312.hs:69:1-69 AnnSemi = [Test10312.hs:71:1])
+
+(AK Test10312.hs:69:20-69 AnnVal = [Test10312.hs:69:57])
+
+(AK Test10312.hs:69:27-55 AnnCloseP = [Test10312.hs:69:55])
+
+(AK Test10312.hs:69:27-55 AnnOpenP = [Test10312.hs:69:27])
+
+(AK Test10312.hs:69:38-54 AnnCloseP = [Test10312.hs:69:54])
+
+(AK Test10312.hs:69:38-54 AnnOpenP = [Test10312.hs:69:38])
+
+(AK Test10312.hs:69:39-53 AnnVal = [Test10312.hs:69:46])
+
+(AK Test10312.hs:71:1-50 AnnDcolon = [Test10312.hs:71:16-17])
+
+(AK Test10312.hs:71:1-50 AnnSemi = [Test10312.hs:72:1])
+
+(AK Test10312.hs:71:19-29 AnnCloseS = [Test10312.hs:71:29])
+
+(AK Test10312.hs:71:19-29 AnnOpenS = [Test10312.hs:71:19])
+
+(AK Test10312.hs:71:19-50 AnnRarrow = [Test10312.hs:71:31-32])
+
+(AK Test10312.hs:71:34-50 AnnCloseS = [Test10312.hs:71:50])
+
+(AK Test10312.hs:71:34-50 AnnOpenS = [Test10312.hs:71:34])
+
+(AK Test10312.hs:71:35-49 AnnCloseP = [Test10312.hs:71:49])
+
+(AK Test10312.hs:71:35-49 AnnOpenP = [Test10312.hs:71:35])
+
+(AK Test10312.hs:71:36-38 AnnComma = [Test10312.hs:71:39])
+
+(AK Test10312.hs:71:41-48 AnnCloseS = [Test10312.hs:71:48])
+
+(AK Test10312.hs:71:41-48 AnnOpenS = [Test10312.hs:71:41])
+
+(AK Test10312.hs:(72,1)-(75,22) AnnEqual = [Test10312.hs:72:20])
+
+(AK Test10312.hs:(72,1)-(75,22) AnnFunId = [Test10312.hs:72:1-14])
+
+(AK Test10312.hs:(72,1)-(75,22) AnnSemi = [Test10312.hs:77:1])
+
+(AK Test10312.hs:(72,22)-(75,22) AnnCloseS = [Test10312.hs:75:22])
+
+(AK Test10312.hs:(72,22)-(75,22) AnnOpenS = [Test10312.hs:72:22])
+
+(AK Test10312.hs:(72,22)-(75,22) AnnVbar = [Test10312.hs:73:22])
+
+(AK Test10312.hs:72:24-49 AnnCloseP = [Test10312.hs:72:49])
+
+(AK Test10312.hs:72:24-49 AnnOpenP = [Test10312.hs:72:24])
+
+(AK Test10312.hs:72:25-37 AnnComma = [Test10312.hs:72:38])
+
+(AK Test10312.hs:73:24-36 AnnCloseC = [Test10312.hs:73:36])
+
+(AK Test10312.hs:73:24-36 AnnDotdot = [Test10312.hs:73:34-35])
+
+(AK Test10312.hs:73:24-36 AnnOpenC = [Test10312.hs:73:33])
+
+(AK Test10312.hs:73:24-43 AnnComma = [Test10312.hs:74:22])
+
+(AK Test10312.hs:73:24-43 AnnLarrow = [Test10312.hs:73:38-39])
+
+(AK Test10312.hs:(73,24)-(74,67) AnnBy = [Test10312.hs:74:35-36])
+
+(AK Test10312.hs:(73,24)-(74,67) AnnGroup = [Test10312.hs:74:29-33])
+
+(AK Test10312.hs:(73,24)-(74,67) AnnThen = [Test10312.hs:74:24-27])
+
+(AK Test10312.hs:(73,24)-(74,67) AnnUsing = [Test10312.hs:74:48-52])
+
+(AK Test10312.hs:(77,1)-(79,80) AnnEqual = [Test10312.hs:77:9])
+
+(AK Test10312.hs:(77,1)-(79,80) AnnFunId = [Test10312.hs:77:1-7])
+
+(AK Test10312.hs:(77,1)-(79,80) AnnSemi = [Test10312.hs:80:1])
+
+(AK Test10312.hs:(77,11)-(79,80) AnnCloseS = [Test10312.hs:79:80])
+
+(AK Test10312.hs:(77,11)-(79,80) AnnOpenS = [Test10312.hs:77:11])
+
+(AK Test10312.hs:(77,11)-(79,80) AnnVbar = [Test10312.hs:77:32])
+
+(AK Test10312.hs:77:13-30 AnnCloseP = [Test10312.hs:77:30])
+
+(AK Test10312.hs:77:13-30 AnnOpenP = [Test10312.hs:77:13])
+
+(AK Test10312.hs:77:14 AnnComma = [Test10312.hs:77:15])
+
+(AK Test10312.hs:77:17-21 AnnComma = [Test10312.hs:77:22])
+
+(AK Test10312.hs:77:34-48 AnnCloseP = [Test10312.hs:77:48])
+
+(AK Test10312.hs:77:34-48 AnnOpenP = [Test10312.hs:77:34])
+
+(AK Test10312.hs:77:34-54 AnnComma = [Test10312.hs:78:36])
+
+(AK Test10312.hs:77:34-54 AnnLarrow = [Test10312.hs:77:50-51])
+
+(AK Test10312.hs:(77,34)-(79,78) AnnBy = [Test10312.hs:79:49-50])
+
+(AK Test10312.hs:(77,34)-(79,78) AnnGroup = [Test10312.hs:79:43-47])
+
+(AK Test10312.hs:(77,34)-(79,78) AnnThen = [Test10312.hs:79:38-41])
+
+(AK Test10312.hs:(77,34)-(79,78) AnnUsing = [Test10312.hs:79:64-68])
+
+(AK Test10312.hs:77:35 AnnComma = [Test10312.hs:77:36])
+
+(AK Test10312.hs:78:38-53 AnnComma = [Test10312.hs:79:36])
+
+(AK Test10312.hs:78:38-53 AnnLet = [Test10312.hs:78:38-40])
+
+(AK Test10312.hs:78:42-53 AnnEqual = [Test10312.hs:78:45])
+
+(AK Test10312.hs:78:42-53 AnnFunId = [Test10312.hs:78:42-43])
+
+(AK Test10312.hs:79:57-62 AnnCloseP = [Test10312.hs:79:62])
+
+(AK Test10312.hs:79:57-62 AnnOpenP = [Test10312.hs:79:57])
+
+(AK Test10312.hs:79:58 AnnComma = [Test10312.hs:79:59])
+
+(AK <no location info> AnnEofPos = [Test10312.hs:80:1])
+]
+
diff --git a/testsuite/tests/ghc-api/annotations/Test10312.hs b/testsuite/tests/ghc-api/annotations/Test10312.hs
new file mode 100644
index 0000000000..6d3c8476e9
--- /dev/null
+++ b/testsuite/tests/ghc-api/annotations/Test10312.hs
@@ -0,0 +1,79 @@
+{-# LANGUAGE ParallelListComp,
+             TransformListComp,
+             RecordWildCards #-}
+module Test10312 where
+-- From
+-- https://ocharles.org.uk/blog/guest-posts/2014-12-07-list-comprehensions.html
+
+import GHC.Exts
+import qualified Data.Map as M
+import Data.Ord (comparing)
+import Data.List (sortBy)
+
+-- Let’s look at a simple, normal list comprehension to start:
+
+regularListComp :: [Int]
+regularListComp = [ x + y * z
+                  | x <- [0..10]
+                  , y <- [10..20]
+                  , z <- [20..30]
+                  ]
+
+parallelListComp :: [Int]
+parallelListComp = [ x + y * z
+                   | x <- [0..10]
+                   | y <- [10..20]
+                   | z <- [20..30]
+                   ]
+
+-- fibs :: [Int]
+-- fibs = 0 : 1 : zipWith (+) fibs (tail fibs)
+
+fibs :: [Int]
+fibs = 0 : 1 : [ x + y
+               | x <- fibs
+               | y <- tail fibs
+               ]
+
+fiblikes :: [Int]
+fiblikes = 0 : 1 : [ x + y + z
+                   | x <- fibs
+                   | y <- tail fibs
+                   | z <- tail (tail fibs)
+                   ]
+
+-- TransformListComp
+data Character = Character
+  { firstName :: String
+  , lastName :: String
+  , birthYear :: Int
+  } deriving (Show, Eq)
+
+friends :: [Character]
+friends = [ Character "Phoebe" "Buffay" 1963
+          , Character "Chandler" "Bing" 1969
+          , Character "Rachel" "Green" 1969
+          , Character "Joey" "Tribbiani" 1967
+          , Character "Monica" "Geller" 1964
+          , Character "Ross" "Geller" 1966
+          ]
+
+oldest :: Int -> [Character] -> [String]
+oldest k tbl = [ firstName ++ " " ++ lastName
+               | Character{..} <- tbl
+               , then sortWith by birthYear
+               , then take k
+               ]
+
+groupByLargest :: Ord b => (a -> b) -> [a] -> [[a]]
+groupByLargest f = sortBy (comparing (negate . length)) . groupWith f
+
+bestBirthYears :: [Character] -> [(Int, [String])]
+bestBirthYears tbl = [ (the birthYear, firstName)
+                     | Character{..} <- tbl
+                     , then group by birthYear using groupByLargest
+                     ]
+
+uniq_fs = [ (n, the p, the d') | (n, Fixity p d) <- fs
+                                   , let d' = ppDir d
+                                   , then group by Down (p,d') using groupWith ]
diff --git a/testsuite/tests/ghc-api/annotations/all.T b/testsuite/tests/ghc-api/annotations/all.T
index e0834af10e..b537bcd617 100644
--- a/testsuite/tests/ghc-api/annotations/all.T
+++ b/testsuite/tests/ghc-api/annotations/all.T
@@ -7,3 +7,4 @@ test('T10255',      normal, run_command, ['$MAKE -s --no-print-directory t10255'
 test('T10268',      normal, run_command, ['$MAKE -s --no-print-directory T10268'])
 test('T10269',      normal, run_command, ['$MAKE -s --no-print-directory T10269'])
 test('T10280',      normal, run_command, ['$MAKE -s --no-print-directory T10280'])
+test('T10312',      normal, run_command, ['$MAKE -s --no-print-directory t10312'])
diff --git a/testsuite/tests/ghc-api/annotations/t10312.hs b/testsuite/tests/ghc-api/annotations/t10312.hs
new file mode 100644
index 0000000000..702a31f776
--- /dev/null
+++ b/testsuite/tests/ghc-api/annotations/t10312.hs
@@ -0,0 +1,106 @@
+{-# LANGUAGE RankNTypes #-}
+
+-- This program must be called with GHC's libdir as the single command line
+-- argument.
+module Main where
+
+-- import Data.Generics
+import Data.Data
+import Data.List
+import System.IO
+import GHC
+import BasicTypes
+import DynFlags
+import MonadUtils
+import Outputable
+import ApiAnnotation
+import Bag (filterBag,isEmptyBag)
+import System.Directory (removeFile)
+import System.Environment( getArgs )
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import Data.Dynamic ( fromDynamic,Dynamic )
+
+main::IO()
+main = do
+        [libdir] <- getArgs
+        testOneFile libdir "Test10312"
+
+testOneFile libdir fileName = do
+       ((anns,cs),p) <- runGhc (Just libdir) $ do
+                        dflags <- getSessionDynFlags
+                        setSessionDynFlags dflags
+                        let mn =mkModuleName fileName
+                        addTarget Target { targetId = TargetModule mn
+                                         , targetAllowObjCode = True
+                                         , targetContents = Nothing }
+                        load LoadAllTargets
+                        modSum <- getModSummary mn
+                        p <- parseModule modSum
+                        return (pm_annotations p,p)
+
+       let spans = Set.fromList $ getAllSrcSpans (pm_parsed_source p)
+
+           problems = filter (\(s,a) -> not (Set.member s spans))
+                             $ getAnnSrcSpans (anns,cs)
+       putStrLn "---Problems---------------------"
+       putStrLn (intercalate "\n" [showAnns $ Map.fromList $ map snd problems])
+       putStrLn "--------------------------------"
+       putStrLn (intercalate "\n" [showAnns anns])
+
+    where
+      getAnnSrcSpans :: ApiAnns -> [(SrcSpan,(ApiAnnKey,[SrcSpan]))]
+      getAnnSrcSpans (anns,_) = map (\a@((ss,_),_) -> (ss,a)) $ Map.toList anns
+
+      getAllSrcSpans :: (Data t) => t -> [SrcSpan]
+      getAllSrcSpans ast = everything (++) ([] `mkQ` getSrcSpan) ast
+        where
+          getSrcSpan :: SrcSpan -> [SrcSpan]
+          getSrcSpan ss = [ss]
+
+
+showAnns anns = "[\n" ++ (intercalate "\n"
+   $ map (\((s,k),v)
+              -> ("(AK " ++ pp s ++ " " ++ show k ++" = " ++ pp v ++ ")\n"))
+   $ Map.toList anns)
+    ++ "]\n"
+
+pp a = showPpr unsafeGlobalDynFlags a
+
+
+-- ---------------------------------------------------------------------
+
+-- Copied from syb for the test
+
+
+-- | Generic queries of type \"r\",
+--   i.e., take any \"a\" and return an \"r\"
+--
+type GenericQ r = forall a. Data a => a -> r
+
+
+-- | Make a generic query;
+--   start from a type-specific case;
+--   return a constant otherwise
+--
+mkQ :: ( Typeable a
+       , Typeable b
+       )
+    => r
+    -> (b -> r)
+    -> a
+    -> r
+(r `mkQ` br) a = case cast a of
+                        Just b  -> br b
+                        Nothing -> r
+
+
+
+-- | Summarise all nodes in top-down, left-to-right order
+everything :: (r -> r -> r) -> GenericQ r -> GenericQ r
+
+-- Apply f to x to summarise top-level node;
+-- use gmapQ to recurse into immediate subterms;
+-- use ordinary foldl to reduce list of intermediate results
+
+everything k f x = foldl k (f x) (gmapQ (everything k f) x)