Diagnostic codes: acccept test changes

The testsuite output now contains diagnostic codes, so many tests need
to be updated at once.
We decided it was best to keep the diagnostic codes in the testsuite
output, so that contributors don't inadvertently make changes to the
diagnostic codes.

46 files changed, 85 insertions, 78 deletions

diff --git a/testsuite/tests/th/T10267.stderr b/testsuite/tests/th/T10267.stderr
index f97ccf0a1f..a6e6aa71e5 100644
--- a/testsuite/tests/th/T10267.stderr
+++ b/testsuite/tests/th/T10267.stderr
@@ -1,5 +1,5 @@
 
-T10267.hs:8:1: error:
+T10267.hs:8:1: error: [GHC-88464]
     • Found hole: _foo :: a -> a
       Where: ‘a’ is a rigid type variable bound by
                the type signature for:
@@ -18,7 +18,7 @@ T10267.hs:8:1: error:
           (imported from ‘Prelude’ at T10267.hs:3:8-13
            (and originally defined in ‘GHC.Base’))
 
-T10267.hs:8:1: error:
+T10267.hs:8:1: error: [GHC-88464]
     • Found hole: _ :: a
       Where: ‘a’ is a rigid type variable bound by
                the type signature for:
diff --git a/testsuite/tests/th/T10638.stderr b/testsuite/tests/th/T10638.stderr
index 582190e688..de833d4fd3 100644
--- a/testsuite/tests/th/T10638.stderr
+++ b/testsuite/tests/th/T10638.stderr
@@ -1,5 +1,5 @@
 
-T10638.hs:26:10: error:
+T10638.hs:26:10: error: [GHC-95774]
     • ‘static test2’ is not a valid C identifier
     • When checking declaration:
         foreign import prim safe "static test2" cmm_test2 :: Int# -> Int#
diff --git a/testsuite/tests/th/T10945.stderr b/testsuite/tests/th/T10945.stderr
index fe71a2f50c..c70a098c9d 100644
--- a/testsuite/tests/th/T10945.stderr
+++ b/testsuite/tests/th/T10945.stderr
@@ -1,5 +1,5 @@
 
-T10945.hs:7:11: error:
+T10945.hs:7:11: error: [GHC-83865]
     • Couldn't match type: [Dec]
                      with: Q [Dec]
       Expected: DecsQ
diff --git a/testsuite/tests/th/T10946.stderr b/testsuite/tests/th/T10946.stderr
index a5b6ebe16c..600625b5a4 100644
--- a/testsuite/tests/th/T10946.stderr
+++ b/testsuite/tests/th/T10946.stderr
@@ -1,5 +1,5 @@
 
-T10946.hs:8:13: error:
+T10946.hs:8:13: error: [GHC-88464]
     • Found hole: _ :: a
       Where: ‘a’ is a rigid type variable bound by
                the type signature for:
diff --git a/testsuite/tests/th/T11145.stderr b/testsuite/tests/th/T11145.stderr
index b8c4a1c6a8..5fba7081a6 100644
--- a/testsuite/tests/th/T11145.stderr
+++ b/testsuite/tests/th/T11145.stderr
@@ -1,5 +1,5 @@
 
-T11145.hs:8:1: error:
+T11145.hs:8:1: error: [GHC-83865]
     • Couldn't match type ‘Bool’ with ‘(a0, b0)’
       Expected: Fuggle Int (Maybe (a0, b0))
         Actual: Fuggle Int (Maybe Bool)
diff --git a/testsuite/tests/th/T11452.stderr b/testsuite/tests/th/T11452.stderr
index 2de5aa0a0f..c0ed994d2d 100644
--- a/testsuite/tests/th/T11452.stderr
+++ b/testsuite/tests/th/T11452.stderr
@@ -6,7 +6,7 @@ T11452.hs:6:12: error:
       In the expression: $$([|| \ _ -> () ||])
       In an equation for ‘impred’: impred = $$([|| \ _ -> () ||])
 
-T11452.hs:6:14: error:
+T11452.hs:6:14: error: [GHC-91028]
     • Couldn't match type ‘p0’ with ‘forall a. a -> a’
       Expected: Language.Haskell.TH.Syntax.Code
                   Language.Haskell.TH.Syntax.Q ((forall a. a -> a) -> ())
diff --git a/testsuite/tests/th/T11680.stderr b/testsuite/tests/th/T11680.stderr
index 05e976837a..9399586df1 100644
--- a/testsuite/tests/th/T11680.stderr
+++ b/testsuite/tests/th/T11680.stderr
@@ -1,30 +1,34 @@
 
-T11680.hs:15:7: error: Variable not in scope: noMatches :: Bool
+T11680.hs:15:7: error: [GHC-88464]
+    Variable not in scope: noMatches :: Bool
 
-T11680.hs:20:7: error:
+T11680.hs:20:7: error: [GHC-88464]
     Variable not in scope: abce :: [a]
     Suggested fix: Perhaps use ‘abcd’ (line 23)
 
-T11680.hs:31:7: error: Variable not in scope: foo :: Int
+T11680.hs:31:7: error: [GHC-88464]
+    Variable not in scope: foo :: Int
 
-T11680.hs:39:7: error:
+T11680.hs:39:7: error: [GHC-88464]
     Variable not in scope: bar :: ()
     Suggested fix:
       Perhaps use one of these: ‘bat’ (line 42), ‘baz’ (line 45)
 
-T11680.hs:50:7: error: Variable not in scope: ns :: [Double]
+T11680.hs:50:7: error: [GHC-88464]
+    Variable not in scope: ns :: [Double]
 
-T11680.hs:55:7: error:
+T11680.hs:55:7: error: [GHC-88464]
     Variable not in scope: intercalate
     Suggested fix:
       Perhaps use ‘List.intercalate’ (imported from Data.List)
 
-T11680.hs:59:7: error:
+T11680.hs:59:7: error: [GHC-88464]
     Variable not in scope: nub
     Suggested fix: Perhaps use ‘List.nub’ (imported from Data.List)
 
-T11680.hs:64:7: error: Variable not in scope: x :: t0 -> Int
+T11680.hs:64:7: error: [GHC-88464]
+    Variable not in scope: x :: t0 -> Int
 
-T11680.hs:69:7: error:
+T11680.hs:69:7: error: [GHC-88464]
     Variable not in scope: cat :: ()
     Suggested fix: Perhaps use ‘bat’ (line 42)
diff --git a/testsuite/tests/th/T11941.stderr b/testsuite/tests/th/T11941.stderr
index ca21f919fe..39a25c7425 100644
--- a/testsuite/tests/th/T11941.stderr
+++ b/testsuite/tests/th/T11941.stderr
@@ -1,5 +1,5 @@
 
-T11941.hs:7:30: error:
+T11941.hs:7:30: error: [GHC-76037]
     Not in scope: ‘getFrst’
     Suggested fix:
       Perhaps use one of these:
diff --git a/testsuite/tests/th/T12387.stderr b/testsuite/tests/th/T12387.stderr
index 53b8550cdd..7b0fa48235 100644
--- a/testsuite/tests/th/T12387.stderr
+++ b/testsuite/tests/th/T12387.stderr
@@ -1,4 +1,4 @@
 
-T12387.hs:8:2: error:
+T12387.hs:8:2: error: [GHC-46284]
     • Class ‘Eq’ does not have a method ‘compare’
     • In the instance declaration for ‘Eq Foo’
diff --git a/testsuite/tests/th/T12387a.stderr b/testsuite/tests/th/T12387a.stderr
index 00645866d4..c9653dec37 100644
--- a/testsuite/tests/th/T12387a.stderr
+++ b/testsuite/tests/th/T12387a.stderr
@@ -1,5 +1,5 @@
 
-T12387a.hs:11:2:
-    Class ‘Eq’ does not have an associated type ‘Rep’
-    In the type instance declaration for ‘Rep’
-        In the instance declaration for ‘Eq Foo’
\ No newline at end of file
+T12387a.hs:11:2: error: [GHC-38351]
+    • Class ‘Eq’ does not have an associated type ‘Rep’
+    • In the type instance declaration for ‘Rep’
+      In the instance declaration for ‘Eq Foo’
diff --git a/testsuite/tests/th/T12411.stderr b/testsuite/tests/th/T12411.stderr
index 79172a1a46..be5f843ee2 100644
--- a/testsuite/tests/th/T12411.stderr
+++ b/testsuite/tests/th/T12411.stderr
@@ -3,4 +3,5 @@ T12411.hs:5:1: error:
     Illegal visible type application ‘@Q’
       Perhaps you intended to use TypeApplications
 
-T12411.hs:5:7: error: Not in scope: type constructor or class ‘Q’
+T12411.hs:5:7: error: [GHC-76037]
+    Not in scope: type constructor or class ‘Q’
diff --git a/testsuite/tests/th/T12513.stderr b/testsuite/tests/th/T12513.stderr
index 26a2dbb1da..efafd33181 100644
--- a/testsuite/tests/th/T12513.stderr
+++ b/testsuite/tests/th/T12513.stderr
@@ -1,10 +1,10 @@
 
-T12513.hs:9:7: error:
+T12513.hs:9:7: error: [GHC-83865]
     • Couldn't match expected type ‘Int’ with actual type ‘(# Int #)’
     • In the expression: x
       In an equation for ‘f’: f x = x
 
-T12513.hs:12:7: error:
+T12513.hs:12:7: error: [GHC-83865]
     • Couldn't match expected type ‘Int’ with actual type ‘(# Int #)’
     • In the expression: x
       In an equation for ‘g’: g x = x
diff --git a/testsuite/tests/th/T12788.stderr b/testsuite/tests/th/T12788.stderr
index 485b2005f9..28ab1a4974 100644
--- a/testsuite/tests/th/T12788.stderr
+++ b/testsuite/tests/th/T12788.stderr
@@ -1,2 +1,2 @@
 
-T12788.hs:9:14: error: Empty record update
+T12788.hs:9:14: error: [GHC-20825] Empty record update
diff --git a/testsuite/tests/th/T13837.stderr b/testsuite/tests/th/T13837.stderr
index a5f1005ca8..a3e58889a3 100644
--- a/testsuite/tests/th/T13837.stderr
+++ b/testsuite/tests/th/T13837.stderr
@@ -1,5 +1,5 @@
 
-T13837.hs:9:4: error:
+T13837.hs:9:4: error: [GHC-97784]
     • The Name ‘Fam’ is not in scope.
     • In the argument of reifyInstances: Fam_0
       In the untyped splice:
diff --git a/testsuite/tests/th/T13968.stderr b/testsuite/tests/th/T13968.stderr
index 420e3c6432..95be60b0b1 100644
--- a/testsuite/tests/th/T13968.stderr
+++ b/testsuite/tests/th/T13968.stderr
@@ -1,3 +1,3 @@
 
-T13968.hs:6:2: error:
+T13968.hs:6:2: error: [GHC-40027]
     Cannot redefine a Name retrieved by a Template Haskell quote: succ
diff --git a/testsuite/tests/th/T14627.stderr b/testsuite/tests/th/T14627.stderr
index 9d9b9785f0..373d59dee8 100644
--- a/testsuite/tests/th/T14627.stderr
+++ b/testsuite/tests/th/T14627.stderr
@@ -1,5 +1,5 @@
 
-T14627.hs:4:1: error:
+T14627.hs:4:1: error: [GHC-31891]
     • Illegal term-level use of the type constructor or class ‘Bool’
     • imported from ‘Prelude’ at T14627.hs:1:1
       (and originally defined in ‘GHC.Types’)
diff --git a/testsuite/tests/th/T15321.stderr b/testsuite/tests/th/T15321.stderr
index 1de67decef..2180b95e09 100644
--- a/testsuite/tests/th/T15321.stderr
+++ b/testsuite/tests/th/T15321.stderr
@@ -1,5 +1,5 @@
 
-T15321.hs:9:9: error:
+T15321.hs:9:9: error: [GHC-88464]
     • Found hole: _ :: String -> Language.Haskell.TH.Lib.Internal.ExpQ
     • In the expression: _ "baz"
       In the untyped splice: $(_ "baz")
diff --git a/testsuite/tests/th/T15360b.stderr b/testsuite/tests/th/T15360b.stderr
index f39226dda8..f3e9f3c427 100644
--- a/testsuite/tests/th/T15360b.stderr
+++ b/testsuite/tests/th/T15360b.stderr
@@ -1,20 +1,21 @@
 
-T15360b.hs:10:13: error:
+T15360b.hs:10:13: error: [GHC-83865]
     • Expected kind ‘* -> k3’, but ‘Type’ has kind ‘*’
     • In the first argument of ‘Proxy’, namely ‘(Type Double)’
       In the type signature: x :: Proxy (Type Double)
 
-T15360b.hs:13:13: error:
-    • Expected kind ‘* -> k2’, but ‘1’ has kind ‘GHC.Num.Natural.Natural’
+T15360b.hs:13:13: error: [GHC-83865]
+    • Expected kind ‘* -> k2’,
+        but ‘1’ has kind ‘GHC.Num.Natural.Natural’
     • In the first argument of ‘Proxy’, namely ‘(1 Int)’
       In the type signature: y :: Proxy (1 Int)
 
-T15360b.hs:16:13: error:
+T15360b.hs:16:13: error: [GHC-83865]
     • Expected kind ‘* -> k1’, but ‘Constraint’ has kind ‘*’
     • In the first argument of ‘Proxy’, namely ‘(Constraint Bool)’
       In the type signature: z :: Proxy (Constraint Bool)
 
-T15360b.hs:19:13: error:
+T15360b.hs:19:13: error: [GHC-83865]
     • Expected kind ‘* -> k0’, but ‘'[]’ has kind ‘[a0]’
     • In the first argument of ‘Proxy’, namely ‘('[] Int)’
       In the type signature: w :: Proxy ('[] Int)
diff --git a/testsuite/tests/th/T15433a.stderr b/testsuite/tests/th/T15433a.stderr
index 13efe8c376..5661f88dd2 100644
--- a/testsuite/tests/th/T15433a.stderr
+++ b/testsuite/tests/th/T15433a.stderr
@@ -1,5 +1,5 @@
 
-T15433a.hs:7:11: error:
+T15433a.hs:7:11: error: [GHC-65507]
     • Wildcard ‘_’ not allowed
     • In the type ‘(_)’
       In the type declaration for ‘T’
diff --git a/testsuite/tests/th/T16980a.stderr b/testsuite/tests/th/T16980a.stderr
index 52673a8779..9ba85cafdc 100644
--- a/testsuite/tests/th/T16980a.stderr
+++ b/testsuite/tests/th/T16980a.stderr
@@ -1,5 +1,5 @@
 
-T16980a.hs:10:5: error:
+T16980a.hs:10:5: error: [GHC-83865]
     • Couldn't match expected type ‘Int’ with actual type ‘Integer’
     • In the expression: x
       In an equation for ‘y’: y = x
diff --git a/testsuite/tests/th/T17380.stderr b/testsuite/tests/th/T17380.stderr
index 3773c76400..b9e1430ff7 100644
--- a/testsuite/tests/th/T17380.stderr
+++ b/testsuite/tests/th/T17380.stderr
@@ -1,29 +1,29 @@
 
-T17380.hs:9:7: error:
+T17380.hs:9:7: error: [GHC-83865]
     • Couldn't match expected type: Solo (Maybe String)
                   with actual type: Maybe String
     • In the expression: Just "wat"
       In an equation for ‘foo’: foo = Just "wat"
 
-T17380.hs:12:8: error:
+T17380.hs:12:8: error: [GHC-83865]
     • Couldn't match expected type: Maybe String
                   with actual type: Solo (Maybe String)
     • In the expression: Solo Just "wat"
       In an equation for ‘bar’: bar = (Solo Just "wat")
 
-T17380.hs:15:6: error:
+T17380.hs:15:6: error: [GHC-83865]
     • Couldn't match expected type: Solo (Maybe String)
                   with actual type: Maybe String
     • In the pattern: Just "wat"
       In an equation for ‘baz’: baz (Just "wat") = Just "frerf"
 
-T17380.hs:18:7: error:
+T17380.hs:18:7: error: [GHC-83865]
     • Couldn't match expected type: Maybe String
                   with actual type: Solo (Maybe String)
     • In the pattern: Solo(Just "wat")
       In an equation for ‘quux’: quux (Solo(Just "wat")) = Just "frerf"
 
-T17380.hs:21:8: error:
+T17380.hs:21:8: error: [GHC-83865]
     • Couldn't match type: Maybe String
                      with: 'Solo (Maybe String)
       Expected: Proxy ('Solo (Maybe String))
@@ -31,7 +31,7 @@ T17380.hs:21:8: error:
     • In the expression: Proxy :: Proxy (Maybe String)
       In an equation for ‘quuz’: quuz = Proxy :: Proxy (Maybe String)
 
-T17380.hs:24:8: error:
+T17380.hs:24:8: error: [GHC-83865]
     • Couldn't match type: 'Solo (Maybe String)
                      with: Maybe String
       Expected: Proxy (Maybe String)
diff --git a/testsuite/tests/th/T17804.stderr b/testsuite/tests/th/T17804.stderr
index 6a18945635..d502dd25f8 100644
--- a/testsuite/tests/th/T17804.stderr
+++ b/testsuite/tests/th/T17804.stderr
@@ -1,9 +1,9 @@
 
-T17804.hs:8:17: warning: [-Wimplicit-lift]
+T17804.hs:8:17: warning: [GHC-00846] [-Wimplicit-lift]
     • The variable ‘x’ is implicitly lifted in the TH quotation
     • In the Template Haskell quotation [| x |]
 
-T17804.hs:11:18: warning: [-Wimplicit-lift]
+T17804.hs:11:18: warning: [GHC-00846] [-Wimplicit-lift]
     • The variable ‘x’ is implicitly lifted in the TH quotation
     • In the Template Haskell quotation [|| x ||]
       In the expression: [|| x ||]
diff --git a/testsuite/tests/th/T18102.stderr b/testsuite/tests/th/T18102.stderr
index 866e3e0777..f8ec2715d2 100644
--- a/testsuite/tests/th/T18102.stderr
+++ b/testsuite/tests/th/T18102.stderr
@@ -1,5 +1,5 @@
 
-T18102.hs:11:22: error:
+T18102.hs:11:22: error: [GHC-76037]
     • Not in scope: ‘ifThenElse’
     • In the Template Haskell typed quotation
         [|| if True then 10 else 15 ||]
@@ -7,7 +7,7 @@ T18102.hs:11:22: error:
         $$(do _stuff <- [|| if True then 10 else 15 ||]
               return [])
 
-T18102.hs:11:35: error:
+T18102.hs:11:35: error: [GHC-76037]
     • Not in scope: ‘fromInteger’
     • In the Template Haskell typed quotation
         [|| if True then 10 else 15 ||]
@@ -18,7 +18,7 @@ T18102.hs:11:35: error:
       Perhaps you want to add ‘fromInteger’ to the import list
       in the import of ‘Prelude’ (T18102.hs:5:1-50).
 
-T18102.hs:11:43: error:
+T18102.hs:11:43: error: [GHC-76037]
     • Not in scope: ‘fromInteger’
     • In the Template Haskell typed quotation
         [|| if True then 10 else 15 ||]
diff --git a/testsuite/tests/th/T18740c.stderr b/testsuite/tests/th/T18740c.stderr
index dd718cbf33..23631f31c4 100644
--- a/testsuite/tests/th/T18740c.stderr
+++ b/testsuite/tests/th/T18740c.stderr
@@ -1,6 +1,6 @@
 
-T18740c.hs:9:1: error:
+T18740c.hs:9:1: error: [GHC-31891]
     • Illegal term-level use of the type variable ‘a’
-        bound at T18740c.hs:9:1
+    • bound at T18740c.hs:9:1
     • In the expression: a
       In an equation for ‘f’: f (Proxy :: Proxy a) = a
diff --git a/testsuite/tests/th/T19709c.stderr b/testsuite/tests/th/T19709c.stderr
index 37451d2023..fae9231c24 100644
--- a/testsuite/tests/th/T19709c.stderr
+++ b/testsuite/tests/th/T19709c.stderr
@@ -1,5 +1,5 @@
 
-T19709c.hs:9:7: error: [-Wincomplete-patterns (in -Wextra), -Werror=incomplete-patterns]
+T19709c.hs:9:7: error: [GHC-62161] [-Wincomplete-patterns (in -Wextra), Werror=incomplete-patterns]
     Pattern match(es) are non-exhaustive
     In a case alternative:
         Patterns of type ‘String’ not matched:
diff --git a/testsuite/tests/th/T19709d.stderr b/testsuite/tests/th/T19709d.stderr
index cacf6acb48..ea19ba8f4c 100644
--- a/testsuite/tests/th/T19709d.stderr
+++ b/testsuite/tests/th/T19709d.stderr
@@ -1,5 +1,5 @@
 
-T19709d.hs:6:2: warning: [-Wincomplete-patterns (in -Wextra)]
+T19709d.hs:6:2: warning: [GHC-62161] [-Wincomplete-patterns (in -Wextra)]
     Pattern match(es) are non-exhaustive
     In a case alternative:
         Patterns of type ‘String’ not matched:
diff --git a/testsuite/tests/th/T20179.stderr b/testsuite/tests/th/T20179.stderr
index 28eb54d698..2bef21b76a 100644
--- a/testsuite/tests/th/T20179.stderr
+++ b/testsuite/tests/th/T20179.stderr
@@ -1,5 +1,5 @@
 
-T20179.hs:4:18: error:
+T20179.hs:4:18: error: [GHC-83865]
     • Expecting one more argument to ‘Maybe’
       Expected a type, but ‘Maybe’ has kind ‘* -> *’
     • In the type signature: slurmp :: [Maybe]
diff --git a/testsuite/tests/th/T20884.stderr b/testsuite/tests/th/T20884.stderr
index 20c1c34fd1..76e6a17588 100644
--- a/testsuite/tests/th/T20884.stderr
+++ b/testsuite/tests/th/T20884.stderr
@@ -1,5 +1,5 @@
 
-T20884.hs:10:17: error:
+T20884.hs:10:17: error: [GHC-31891]
     • The data constructor ‘:’ does not live in the type-level namespace
     • In the Template Haskell quotation ''(:)
       In the untyped splice:
diff --git a/testsuite/tests/th/T2713.stderr b/testsuite/tests/th/T2713.stderr
index ce9091c79c..ae40f1ba48 100644
--- a/testsuite/tests/th/T2713.stderr
+++ b/testsuite/tests/th/T2713.stderr
@@ -1,10 +1,10 @@
 
-T2713.hs:11:10: error:
+T2713.hs:11:10: error: [GHC-44432]
     The fixity signature for ‘.*.’ lacks an accompanying binding
     Suggested fix:
       Move the fixity signature to the declaration site of ‘.*.’.
 
-T2713.hs:12:1: error:
+T2713.hs:12:1: error: [GHC-44432]
     The type signature for ‘f’ lacks an accompanying binding
     Suggested fix:
       Move the type signature to the declaration site of ‘f’.
diff --git a/testsuite/tests/th/T3177a.stderr b/testsuite/tests/th/T3177a.stderr
index a9b8bed980..471542155f 100644
--- a/testsuite/tests/th/T3177a.stderr
+++ b/testsuite/tests/th/T3177a.stderr
@@ -1,8 +1,8 @@
 
-T3177a.hs:8:7: error:
+T3177a.hs:8:7: error: [GHC-83865]
     • Expected kind ‘* -> *’, but ‘Int’ has kind ‘*’
     • In the type signature: f :: (Int Int)
 
-T3177a.hs:11:6: error:
+T3177a.hs:11:6: error: [GHC-83865]
     • Expected kind ‘* -> *’, but ‘Int’ has kind ‘*’
     • In the type signature: g :: Int Int
diff --git a/testsuite/tests/th/T5358.stderr b/testsuite/tests/th/T5358.stderr
index c6bb4c11c8..4dfd36f8c4 100644
--- a/testsuite/tests/th/T5358.stderr
+++ b/testsuite/tests/th/T5358.stderr
@@ -1,15 +1,15 @@
 
-T5358.hs:7:1: error:
+T5358.hs:7:1: error: [GHC-83865]
     • Couldn't match expected type ‘Int’ with actual type ‘p1 -> p1’
     • The equation for ‘t1’ has one value argument,
         but its type ‘Int’ has none
 
-T5358.hs:8:1: error:
+T5358.hs:8:1: error: [GHC-83865]
     • Couldn't match expected type ‘Int’ with actual type ‘p0 -> p0’
     • The equation for ‘t2’ has one value argument,
         but its type ‘Int’ has none
 
-T5358.hs:10:13: error:
+T5358.hs:10:13: error: [GHC-83865]
     • Couldn't match expected type ‘t -> a0’ with actual type ‘Int’
     • The function ‘t1’ is applied to one value argument,
         but its type ‘Int’ has none
@@ -19,7 +19,7 @@ T5358.hs:10:13: error:
         x :: t (bound at T5358.hs:10:9)
         prop_x1 :: t -> Bool (bound at T5358.hs:10:1)
 
-T5358.hs:10:21: error:
+T5358.hs:10:21: error: [GHC-83865]
     • Couldn't match expected type ‘t -> a0’ with actual type ‘Int’
     • The function ‘t2’ is applied to one value argument,
         but its type ‘Int’ has none
diff --git a/testsuite/tests/th/T5971.stderr b/testsuite/tests/th/T5971.stderr
index c06561b853..4dc4584605 100644
--- a/testsuite/tests/th/T5971.stderr
+++ b/testsuite/tests/th/T5971.stderr
@@ -1,5 +1,5 @@
 
-T5971.hs:6:6: error:
+T5971.hs:6:6: error: [GHC-97784]
     • The Name ‘x’ is not in scope.
     • In the untyped splice: $(newName "x" >>= varE)
     Suggested fix:
diff --git a/testsuite/tests/th/T6018th.stderr b/testsuite/tests/th/T6018th.stderr
index c141bfc44a..b5297c0d64 100644
--- a/testsuite/tests/th/T6018th.stderr
+++ b/testsuite/tests/th/T6018th.stderr
@@ -1,5 +1,5 @@
 
-T6018th.hs:98:2: error:
+T6018th.hs:98:2: error: [GHC-05175]
     Type family equation right-hand sides overlap; this violates
     the family's injectivity annotation:
       H Int Int Int = Bool -- Defined at T6018th.hs:98:2
diff --git a/testsuite/tests/th/T7241.stderr b/testsuite/tests/th/T7241.stderr
index a46daa2c25..33fbb58061 100644
--- a/testsuite/tests/th/T7241.stderr
+++ b/testsuite/tests/th/T7241.stderr
@@ -1,5 +1,5 @@
 
-T7241.hs:7:2: error:
+T7241.hs:7:2: error: [GHC-81573]
     Same Name in multiple name-spaces:
       type constructor or class ‘Foo’, declared at: T7241.hs:7:2
       data constructor ‘Foo’, declared at: T7241.hs:7:2
diff --git a/testsuite/tests/th/T7276.stderr b/testsuite/tests/th/T7276.stderr
index 2b1dfb96be..4c73db695a 100644
--- a/testsuite/tests/th/T7276.stderr
+++ b/testsuite/tests/th/T7276.stderr
@@ -1,7 +1,7 @@
 
 T7276.hs:6:5: error:
     • Exception when trying to run compile-time code:
-        T7276.hs:6:8: error:
+        T7276.hs:6:8: error: [GHC-83865]
     • Couldn't match type ‘[Language.Haskell.TH.Syntax.Dec]’
                      with ‘Language.Haskell.TH.Syntax.Exp’
       Expected: Language.Haskell.TH.Lib.Internal.ExpQ
diff --git a/testsuite/tests/th/T7276a.stdout b/testsuite/tests/th/T7276a.stdout
index 33b418477a..68f6791443 100644
--- a/testsuite/tests/th/T7276a.stdout
+++ b/testsuite/tests/th/T7276a.stdout
@@ -1,5 +1,5 @@
 
-<interactive>:3:9: warning: [-Wdeferred-type-errors (in -Wdefault)]
+<interactive>:3:9: warning: [GHC-83865] [-Wdeferred-type-errors (in -Wdefault)]
     • Couldn't match type ‘[Dec]’ with ‘Exp’
       Expected: Q Exp
         Actual: Q Language.Haskell.TH.Lib.Internal.Decs
@@ -8,7 +8,7 @@
 
 <interactive>:1:1: error:
     • Exception when trying to run compile-time code:
-        <interactive>:3:9: error:
+        <interactive>:3:9: error: [GHC-83865]
     • Couldn't match type ‘[Dec]’ with ‘Exp’
       Expected: Q Exp
         Actual: Q Language.Haskell.TH.Lib.Internal.Decs
diff --git a/testsuite/tests/th/T8577.stderr b/testsuite/tests/th/T8577.stderr
index 9c83d3c657..77d97f2eba 100644
--- a/testsuite/tests/th/T8577.stderr
+++ b/testsuite/tests/th/T8577.stderr
@@ -1,5 +1,5 @@
 
-T8577.hs:9:11: error:
+T8577.hs:9:11: error: [GHC-83865]
     • Couldn't match type ‘Int’ with ‘Bool’
       Expected: Code Q (A Bool)
         Actual: Code Q (A Int)
diff --git a/testsuite/tests/th/T9084.stderr b/testsuite/tests/th/T9084.stderr
index 722735d306..1411155914 100644
--- a/testsuite/tests/th/T9084.stderr
+++ b/testsuite/tests/th/T9084.stderr
@@ -1,3 +1,3 @@
 
-T9084.hs:5:2: error:
+T9084.hs:5:2: error: [GHC-65904]
     MINIMAL pragmas not (yet) handled by Template Haskell
diff --git a/testsuite/tests/th/T9209.stderr b/testsuite/tests/th/T9209.stderr
index 1f4f3e78ab..261a6bcad6 100644
--- a/testsuite/tests/th/T9209.stderr
+++ b/testsuite/tests/th/T9209.stderr
@@ -1,4 +1,4 @@
 
-T9209.hs:5:11:
+T9209.hs:5:11: error: [GHC-08451]
     Declaration splices are allowed only at the top level:
       $([d| x = 5 |])
diff --git a/testsuite/tests/th/TH_1tuple.stderr b/testsuite/tests/th/TH_1tuple.stderr
index fad311b0c8..4ceeb9befe 100644
--- a/testsuite/tests/th/TH_1tuple.stderr
+++ b/testsuite/tests/th/TH_1tuple.stderr
@@ -1,5 +1,5 @@
 
-TH_1tuple.hs:11:6: error:
+TH_1tuple.hs:11:6: error: [GHC-83865]
     • Expecting one more argument to ‘Solo’
       Expected a type, but ‘Solo’ has kind ‘* -> *’
     • In an expression type signature: Solo
diff --git a/testsuite/tests/th/TH_dataD1.stderr b/testsuite/tests/th/TH_dataD1.stderr
index 51ae5b9d82..c04d2d92d8 100644
--- a/testsuite/tests/th/TH_dataD1.stderr
+++ b/testsuite/tests/th/TH_dataD1.stderr
@@ -1,3 +1,3 @@
 
-TH_dataD1.hs:7:6:
+TH_dataD1.hs:7:6: error: [GHC-65904]
     Splices within declaration brackets not (yet) handled by Template Haskell
diff --git a/testsuite/tests/th/TH_linePragma.stderr b/testsuite/tests/th/TH_linePragma.stderr
index 03f35db988..aefd003905 100644
--- a/testsuite/tests/th/TH_linePragma.stderr
+++ b/testsuite/tests/th/TH_linePragma.stderr
@@ -1,2 +1,3 @@
 
-virtual file:42:1: error: Variable not in scope: doesntExist
+virtual file:42:1: error: [GHC-88464]
+    Variable not in scope: doesntExist
diff --git a/testsuite/tests/th/TH_recover_warns.stderr b/testsuite/tests/th/TH_recover_warns.stderr
index 24bfb76f1d..848f1b1380 100644
--- a/testsuite/tests/th/TH_recover_warns.stderr
+++ b/testsuite/tests/th/TH_recover_warns.stderr
@@ -10,6 +10,6 @@ TH_recover_warns.hs:9:18: warning: [-Wunused-local-binds (in -Wextra, -Wunused-b
 TH_recover_warns.hs:10:34: warning: [-Wunused-local-binds (in -Wextra, -Wunused-binds)]
     Defined but not used: ‘x’
 
-TH_recover_warns.hs:10:49: warning: [-Wname-shadowing (in -Wall)]
+TH_recover_warns.hs:10:49: warning: [GHC-63397] [-Wname-shadowing (in -Wall)]
     This binding for ‘x’ shadows the existing binding
       bound at TH_recover_warns.hs:10:34
diff --git a/testsuite/tests/th/TH_repPatSigTVar.stderr b/testsuite/tests/th/TH_repPatSigTVar.stderr
index fb02dd9fb8..4f80f9eb38 100644
--- a/testsuite/tests/th/TH_repPatSigTVar.stderr
+++ b/testsuite/tests/th/TH_repPatSigTVar.stderr
@@ -1,5 +1,5 @@
 
-TH_repPatSigTVar.hs:8:64: error:
+TH_repPatSigTVar.hs:8:64: error: [GHC-76037]
     • Not in scope: type variable ‘c’
     • In the Template Haskell quotation ''c
       In the untyped splice: $(sigE (varE 'undefined) (varT ''c))
diff --git a/testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr b/testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr
index 1731b58b28..902f6b37a4 100644
--- a/testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr
+++ b/testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr
@@ -1,5 +1,5 @@
 
-TH_overloaded_constraints_fail.hs:20:14: error:
+TH_overloaded_constraints_fail.hs:20:14: error: [GHC-83865]
     • Couldn't match type ‘Identity’ with ‘Q’
       Expected: Q Exp
         Actual: Identity Exp
diff --git a/testsuite/tests/th/overloaded/TH_overloaded_no_instance.stderr b/testsuite/tests/th/overloaded/TH_overloaded_no_instance.stderr
index 7e8eab0702..fb78463b1e 100644
--- a/testsuite/tests/th/overloaded/TH_overloaded_no_instance.stderr
+++ b/testsuite/tests/th/overloaded/TH_overloaded_no_instance.stderr
@@ -1,5 +1,5 @@
 
-TH_overloaded_no_instance.hs:13:10: error:
+TH_overloaded_no_instance.hs:13:10: error: [GHC-39999]
     • No instance for ‘Quote NewType’ arising from a quotation bracket
     • In the expression: [| 5 |]
       In an equation for ‘quote2’: quote2 = [| 5 |]