Revert stage 1 template-haskell. This is a combination of 5 commits.

Revert "Quick fix: drop base bound on template-haskell."

This reverts commit 3c70ae032e4361b203dfcf22b0a424e8838a5037.

Revert "Always do polymorphic typed quote check, c.f. #10384"

This reverts commit 9a43b2c1f78b3cf684646af64b9b67dc8079f58f.

Revert "RnSplice's staging test should be applied for quotes in stage1."

This reverts commit eb0ed4030374af542c0a459480d32c8d4525e48d.

Revert "Split off quotes/ from th/ for tests that can be done on stage1 compiler."

This reverts commit 21c72e7d38c96ac80d31addf67ae4b3c7a6c3bbb.

Revert "Support stage 1 Template Haskell (non-quasi) quotes, fixes #10382."

This reverts commit 28257cae77023f2ccc4cc1c0cd1fbbd329947a00.

41 files changed, 66 insertions, 104 deletions

diff --git a/testsuite/tests/quotes/.gitignore b/testsuite/tests/quotes/.gitignore
deleted file mode 100644
index 1c8a416fcd..0000000000
--- a/testsuite/tests/quotes/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-T3572
-T8633
-TH_ppr1
-TH_spliceViewPat/TH_spliceViewPat
diff --git a/testsuite/tests/quotes/Makefile b/testsuite/tests/quotes/Makefile
deleted file mode 100644
index 9a36a1c5fe..0000000000
--- a/testsuite/tests/quotes/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/quotes/T10384.hs b/testsuite/tests/quotes/T10384.hs
deleted file mode 100644
index 773deb061a..0000000000
--- a/testsuite/tests/quotes/T10384.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-{-# LANGUAGE TemplateHaskell, RankNTypes, ScopedTypeVariables #-}
-module A where
-x = \(y :: forall a. a -> a) -> [|| y ||]
diff --git a/testsuite/tests/quotes/T10384.stderr b/testsuite/tests/quotes/T10384.stderr
deleted file mode 100644
index f2360fd5ba..0000000000
--- a/testsuite/tests/quotes/T10384.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-T10384.hs:3:37: error:
-    Can't splice the polymorphic local variable ‘y’
-    In the Template Haskell quotation [|| y ||]
-    In the expression: [|| y ||]
-    In the expression: \ (y :: forall a. a -> a) -> [|| y ||]
diff --git a/testsuite/tests/quotes/T8455.hs b/testsuite/tests/quotes/T8455.hs
deleted file mode 100644
index 69d1271b40..0000000000
--- a/testsuite/tests/quotes/T8455.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-
-module T8455 where
-
-ty = [t| 5 |]
diff --git a/testsuite/tests/quotes/TH_localname.hs b/testsuite/tests/quotes/TH_localname.hs
deleted file mode 100644
index 5bc0e96036..0000000000
--- a/testsuite/tests/quotes/TH_localname.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module TH_localname where
-
-x = \y -> [| y |]
diff --git a/testsuite/tests/quotes/TH_localname.stderr b/testsuite/tests/quotes/TH_localname.stderr
deleted file mode 100644
index a83c606eb4..0000000000
--- a/testsuite/tests/quotes/TH_localname.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-
-TH_localname.hs:3:11: error:
-    No instance for (Lift t0) arising from a use of ‘lift’
-    The type variable ‘t0’ is ambiguous
-    Relevant bindings include
-      y :: t0 (bound at TH_localname.hs:3:6)
-      x :: t0 -> ExpQ (bound at TH_localname.hs:3:1)
-    Note: there are several potential instances:
-      instance (Lift a, Lift b) => Lift (Either a b)
-        -- Defined in ‘Language.Haskell.TH.Syntax’
-      instance Lift a => Lift (Maybe a)
-        -- Defined in ‘Language.Haskell.TH.Syntax’
-      instance Lift Int16 -- Defined in ‘Language.Haskell.TH.Syntax’
-      ...plus 24 others
-    In the expression: lift y
-    In the expression:
-      [| y |]
-      pending(rn) [<y, lift y>]
-    In the expression:
-      \ y
-        -> [| y |]
-           pending(rn) [<y, lift y>]
diff --git a/testsuite/tests/quotes/all.T b/testsuite/tests/quotes/all.T
deleted file mode 100644
index a56a50c010..0000000000
--- a/testsuite/tests/quotes/all.T
+++ /dev/null
@@ -1,31 +0,0 @@
-def f(name, opts):
-    opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell'
-
-setTestOpts(f)
-
-test('T2632', normal, compile, [''])
-test('T2931', normal, compile, ['-v0'])
-test('T3572', normal, compile_and_run, [''])
-test('T4056', normal, compile, ['-v0'])
-test('T4169', normal, compile, ['-v0'])
-test('T4170', normal, compile, ['-v0'])
-test('T5721', normal, compile, ['-v0'])
-test('T6062', normal, compile, ['-v0'])
-test('T8455', normal, compile, ['-v0'])
-test('T8633', normal, compile_and_run, [''])
-test('T8759a', normal, compile_fail, ['-v0'])
-test('T9824', normal, compile, ['-v0'])
-test('T10384', normal, compile_fail, [''])
-
-test('TH_tf2', normal, compile, ['-v0'])
-test('TH_ppr1', normal, compile_and_run, [''])
-test('TH_bracket1', normal, compile, [''])
-test('TH_bracket2', normal, compile, [''])
-test('TH_bracket3', normal, compile, [''])
-test('TH_scope', normal, compile, [''])
-test('TH_reifyType1', normal, compile, [''])
-test('TH_reifyType2', normal, compile, [''])
-test('TH_repE1', normal, compile, [''])
-test('TH_repE3', normal, compile, [''])
-test('TH_abstractFamily', normal, compile_fail, [''])
-test('TH_localname', normal, compile_fail, [''])
diff --git a/testsuite/tests/quotes/T2632.hs b/testsuite/tests/th/T2632.hs
index 71f6350cc2..31429e28d9 100644
--- a/testsuite/tests/quotes/T2632.hs
+++ b/testsuite/tests/th/T2632.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 -- Trac #2632
 
 module MkData where
diff --git a/testsuite/tests/quotes/T2931.hs b/testsuite/tests/th/T2931.hs
index 43aeda0ece..01e57a934d 100644
--- a/testsuite/tests/quotes/T2931.hs
+++ b/testsuite/tests/th/T2931.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TemplateHaskell #-}
 -- Trac #2931
 
 module Foo where
diff --git a/testsuite/tests/quotes/T3572.hs b/testsuite/tests/th/T3572.hs
index 4717fd2735..4717fd2735 100644
--- a/testsuite/tests/quotes/T3572.hs
+++ b/testsuite/tests/th/T3572.hs
diff --git a/testsuite/tests/quotes/T3572.stdout b/testsuite/tests/th/T3572.stdout
index 9df7a449ff..9df7a449ff 100644
--- a/testsuite/tests/quotes/T3572.stdout
+++ b/testsuite/tests/th/T3572.stdout
diff --git a/testsuite/tests/quotes/T4056.hs b/testsuite/tests/th/T4056.hs
index a9b936987c..211d2b51f4 100644
--- a/testsuite/tests/quotes/T4056.hs
+++ b/testsuite/tests/th/T4056.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeFamilies, RankNTypes, FlexibleContexts #-}
+{-# LANGUAGE TemplateHaskell, TypeFamilies, RankNTypes, FlexibleContexts #-}
 
 module T4056 where
 import Language.Haskell.TH
diff --git a/testsuite/tests/quotes/T4169.hs b/testsuite/tests/th/T4169.hs
index cdef4a2e3a..1fa3ad7cb7 100644
--- a/testsuite/tests/quotes/T4169.hs
+++ b/testsuite/tests/th/T4169.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE TemplateHaskell #-}
+
 -- Crashed GHC 6.12
 
 module T4165 where
diff --git a/testsuite/tests/quotes/T4170.hs b/testsuite/tests/th/T4170.hs
index 46319abaf0..87ccad6c5b 100644
--- a/testsuite/tests/quotes/T4170.hs
+++ b/testsuite/tests/th/T4170.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TemplateHaskell #-}
 module T4170 where
 
 import Language.Haskell.TH
diff --git a/testsuite/tests/quotes/T5721.hs b/testsuite/tests/th/T5721.hs
index ed5e7e380b..60879c7570 100644
--- a/testsuite/tests/quotes/T5721.hs
+++ b/testsuite/tests/th/T5721.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TemplateHaskell, ScopedTypeVariables #-}
 
 module T5371 where
 import Language.Haskell.TH
diff --git a/testsuite/tests/quotes/T6062.hs b/testsuite/tests/th/T6062.hs
index 342850e853..330b3f2b8b 100644
--- a/testsuite/tests/quotes/T6062.hs
+++ b/testsuite/tests/th/T6062.hs
@@ -1,2 +1,3 @@
+{-# LANGUAGE TemplateHaskell #-}
 module T6062 where
 x = [| False True |]
diff --git a/testsuite/tests/th/T8455.hs b/testsuite/tests/th/T8455.hs
new file mode 100644
index 0000000000..08217b37d1
--- /dev/null
+++ b/testsuite/tests/th/T8455.hs
@@ -0,0 +1,5 @@
+{-# LANGUAGE TemplateHaskell, DataKinds #-}
+
+module T8455 where
+
+ty = [t| 5 |]
diff --git a/testsuite/tests/quotes/T8633.hs b/testsuite/tests/th/T8633.hs
index eb2b3f3a3b..0c73579e12 100644
--- a/testsuite/tests/quotes/T8633.hs
+++ b/testsuite/tests/th/T8633.hs
@@ -1,19 +1,19 @@
-module Main where
-import Language.Haskell.TH.Syntax
-
-t1 = case mkName "^.." of
-    Name (OccName ".")  (NameQ (ModName "^")) -> error "bug0"
-    Name (OccName "^..") NameS                -> return ()
-
-t2 = case mkName "Control.Lens.^.." of
-    Name (OccName ".")  (NameQ (ModName "Control.Lens.^")) -> error "bug1"
-    Name (OccName "^..") (NameQ (ModName "Control.Lens")) -> return ()
-
-t3 = case mkName "Data.Bits..&." of
-    Name (OccName ".&.") (NameQ (ModName "Data.Bits")) -> return ()
-
-t4 = case mkName "abcde" of
-    Name (OccName "abcde") NameS -> return ()
-
-main :: IO ()
-main = do t1; t2; t3; t4
+module Main where

+import Language.Haskell.TH.Syntax

+

+t1 = case mkName "^.." of

+    Name (OccName ".")  (NameQ (ModName "^")) -> error "bug0"

+    Name (OccName "^..") NameS                -> return ()

+

+t2 = case mkName "Control.Lens.^.." of

+    Name (OccName ".")  (NameQ (ModName "Control.Lens.^")) -> error "bug1"

+    Name (OccName "^..") (NameQ (ModName "Control.Lens")) -> return ()

+

+t3 = case mkName "Data.Bits..&." of

+    Name (OccName ".&.") (NameQ (ModName "Data.Bits")) -> return ()

+

+t4 = case mkName "abcde" of

+    Name (OccName "abcde") NameS -> return ()

+

+main :: IO ()

+main = do t1; t2; t3; t4

diff --git a/testsuite/tests/quotes/T8759a.hs b/testsuite/tests/th/T8759a.hs
index 37b65d6fcc..3d8089c2fa 100644
--- a/testsuite/tests/quotes/T8759a.hs
+++ b/testsuite/tests/th/T8759a.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PatternSynonyms #-}
+{-# LANGUAGE TemplateHaskell, PatternSynonyms #-}
 
 module T8759a where
 
diff --git a/testsuite/tests/quotes/T8759a.stderr b/testsuite/tests/th/T8759a.stderr
index ff0fd495df..ff0fd495df 100644
--- a/testsuite/tests/quotes/T8759a.stderr
+++ b/testsuite/tests/th/T8759a.stderr
diff --git a/testsuite/tests/quotes/T9824.hs b/testsuite/tests/th/T9824.hs
index 9a2d6fdfef..828c00893c 100644
--- a/testsuite/tests/quotes/T9824.hs
+++ b/testsuite/tests/th/T9824.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -fwarn-unused-matches #-}
 
 module T9824 where
diff --git a/testsuite/tests/quotes/TH_abstractFamily.hs b/testsuite/tests/th/TH_abstractFamily.hs
index 78d7e43931..78d7e43931 100644
--- a/testsuite/tests/quotes/TH_abstractFamily.hs
+++ b/testsuite/tests/th/TH_abstractFamily.hs
diff --git a/testsuite/tests/quotes/TH_abstractFamily.stderr b/testsuite/tests/th/TH_abstractFamily.stderr
index c0aa8d274b..c0aa8d274b 100644
--- a/testsuite/tests/quotes/TH_abstractFamily.stderr
+++ b/testsuite/tests/th/TH_abstractFamily.stderr
diff --git a/testsuite/tests/quotes/TH_bracket1.hs b/testsuite/tests/th/TH_bracket1.hs
index 7dee21ba01..7dee21ba01 100644
--- a/testsuite/tests/quotes/TH_bracket1.hs
+++ b/testsuite/tests/th/TH_bracket1.hs
diff --git a/testsuite/tests/quotes/TH_bracket2.hs b/testsuite/tests/th/TH_bracket2.hs
index 2b06b9eecb..2b06b9eecb 100644
--- a/testsuite/tests/quotes/TH_bracket2.hs
+++ b/testsuite/tests/th/TH_bracket2.hs
diff --git a/testsuite/tests/quotes/TH_bracket3.hs b/testsuite/tests/th/TH_bracket3.hs
index c746d61cd3..c746d61cd3 100644
--- a/testsuite/tests/quotes/TH_bracket3.hs
+++ b/testsuite/tests/th/TH_bracket3.hs
diff --git a/testsuite/tests/quotes/TH_ppr1.hs b/testsuite/tests/th/TH_ppr1.hs
index 763d7682e0..763d7682e0 100644
--- a/testsuite/tests/quotes/TH_ppr1.hs
+++ b/testsuite/tests/th/TH_ppr1.hs
diff --git a/testsuite/tests/quotes/TH_ppr1.stdout b/testsuite/tests/th/TH_ppr1.stdout
index e969c176c3..e969c176c3 100644
--- a/testsuite/tests/quotes/TH_ppr1.stdout
+++ b/testsuite/tests/th/TH_ppr1.stdout
diff --git a/testsuite/tests/quotes/TH_reifyType1.hs b/testsuite/tests/th/TH_reifyType1.hs
index d8b45db271..d8b45db271 100644
--- a/testsuite/tests/quotes/TH_reifyType1.hs
+++ b/testsuite/tests/th/TH_reifyType1.hs
diff --git a/testsuite/tests/quotes/TH_reifyType2.hs b/testsuite/tests/th/TH_reifyType2.hs
index 85615b5382..85615b5382 100644
--- a/testsuite/tests/quotes/TH_reifyType2.hs
+++ b/testsuite/tests/th/TH_reifyType2.hs
diff --git a/testsuite/tests/quotes/TH_repE1.hs b/testsuite/tests/th/TH_repE1.hs
index 1938a9bdc3..1938a9bdc3 100644
--- a/testsuite/tests/quotes/TH_repE1.hs
+++ b/testsuite/tests/th/TH_repE1.hs
diff --git a/testsuite/tests/quotes/TH_repE3.hs b/testsuite/tests/th/TH_repE3.hs
index 5f0453c1a7..5f0453c1a7 100644
--- a/testsuite/tests/quotes/TH_repE3.hs
+++ b/testsuite/tests/th/TH_repE3.hs
diff --git a/testsuite/tests/quotes/TH_scope.hs b/testsuite/tests/th/TH_scope.hs
index 7674a5d1c0..7674a5d1c0 100644
--- a/testsuite/tests/quotes/TH_scope.hs
+++ b/testsuite/tests/th/TH_scope.hs
diff --git a/testsuite/tests/quotes/TH_spliceViewPat/A.hs b/testsuite/tests/th/TH_spliceViewPat/A.hs
index 0147d2eca2..0147d2eca2 100644
--- a/testsuite/tests/quotes/TH_spliceViewPat/A.hs
+++ b/testsuite/tests/th/TH_spliceViewPat/A.hs
diff --git a/testsuite/tests/quotes/TH_spliceViewPat/Main.hs b/testsuite/tests/th/TH_spliceViewPat/Main.hs
index 675ae99bf9..675ae99bf9 100644
--- a/testsuite/tests/quotes/TH_spliceViewPat/Main.hs
+++ b/testsuite/tests/th/TH_spliceViewPat/Main.hs
diff --git a/testsuite/tests/quotes/TH_spliceViewPat/Makefile b/testsuite/tests/th/TH_spliceViewPat/Makefile
index 4a268530f1..4a268530f1 100644
--- a/testsuite/tests/quotes/TH_spliceViewPat/Makefile
+++ b/testsuite/tests/th/TH_spliceViewPat/Makefile
diff --git a/testsuite/tests/quotes/TH_spliceViewPat/TH_spliceViewPat.stdout b/testsuite/tests/th/TH_spliceViewPat/TH_spliceViewPat.stdout
index 4792e70f33..4792e70f33 100644
--- a/testsuite/tests/quotes/TH_spliceViewPat/TH_spliceViewPat.stdout
+++ b/testsuite/tests/th/TH_spliceViewPat/TH_spliceViewPat.stdout
diff --git a/testsuite/tests/quotes/TH_spliceViewPat/test.T b/testsuite/tests/th/TH_spliceViewPat/test.T
index 3075ef4b1f..21fdff3518 100644
--- a/testsuite/tests/quotes/TH_spliceViewPat/test.T
+++ b/testsuite/tests/th/TH_spliceViewPat/test.T
@@ -1,7 +1,12 @@
 def f(name, opts):
     opts.extra_hc_opts = '-XTemplateHaskell -package template-haskell'
+    if (ghc_with_interpreter == 0):
+        opts.skip = 1
 
 setTestOpts(f)
+setTestOpts(only_compiler_types(['ghc']))
+setTestOpts(only_ways(['normal','ghci']))
+setTestOpts(when(compiler_profiled(), skip))
 
 test('TH_spliceViewPat',
      extra_clean(['Main.o', 'Main.hi', 'A.o', 'A.hi']),
diff --git a/testsuite/tests/quotes/TH_tf2.hs b/testsuite/tests/th/TH_tf2.hs
index 9f313d4a3e..9f313d4a3e 100644
--- a/testsuite/tests/quotes/TH_tf2.hs
+++ b/testsuite/tests/th/TH_tf2.hs
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 43c3e89b02..dda8274c5b 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -1,8 +1,3 @@
-# NOTICE TO DEVELOPERS
-# ~~~~~~~~~~~~~~~~~~~~
-# Adding a TemplateHaskell test?  If it only contains (non-quasi) quotes
-# and no splices, consider adding it to the quotes/ directory instead
-# of the th/ directory; this way, we can test it on the stage 1 compiler too!
 
 # This test needs to come before the setTestOpts calls below, as we want
 # to run it if compiler_profiled.
@@ -21,7 +16,9 @@ setTestOpts(when(compiler_profiled(), skip))
 test('TH_mkName', normal, compile, ['-v0'])
 test('TH_1tuple', normal, compile_fail, ['-v0'])
 
+test('TH_repE1', normal, compile, [''])
 test('TH_repE2', normal, compile_and_run, [''])
+test('TH_repE3', normal, compile, [''])
 test('TH_repPrim', normal, compile, ['-v0'])
 test('TH_repPrim2', normal, compile, ['-v0'])
 test('TH_repUnboxedTuples', normal, compile, ['-v0'])
@@ -70,6 +67,8 @@ test('TH_spliceD2',
 test('TH_reifyDecl1', normal, compile, ['-v0'])
 test('TH_reifyDecl2', normal, compile, ['-v0'])
 
+test('TH_reifyType1', normal, compile, [''])
+test('TH_reifyType2', normal, compile, [''])
 test('TH_reifyMkName', normal, compile, ['-v0'])
 
 test('TH_reifyInstances', normal, compile, ['-v0'])
@@ -100,6 +99,10 @@ test('TH_spliceExpr1', normal, compile, ['-v0'])
 test('TH_spliceE3', normal, compile, ['-v0'])
 test('TH_spliceE4', normal, compile_and_run, [''])
 
+test('TH_bracket1', normal, compile, [''])
+test('TH_bracket2', normal, compile, [''])
+test('TH_bracket3', normal, compile, [''])
+
 test('TH_class1', normal, compile, ['-v0'])
 test('TH_tuple1', normal, compile, ['-v0'])
 test('TH_genEx',
@@ -119,6 +122,8 @@ test('TH_exn2', normal, compile_fail, ['-v0'])
 test('TH_recover', normal, compile_and_run, [''])
 test('TH_dataD1', normal, compile_fail, ['-v0'])
 
+test('TH_ppr1', normal, compile_and_run, [''])
+
 test('TH_fail', normal, compile_fail, ['-v0'])
 test('TH_scopedTvs', normal, compile, ['-v0'])
 
@@ -128,10 +133,13 @@ test('TH_ghci1', normal, ghci_script, ['TH_ghci1.script'])
 
 test('TH_linePragma', normal, compile_fail, ['-v0'])
 
+test('TH_scope', normal, compile, [''])
+test('T2632', normal, compile, [''])
 test('T2700', normal, compile, ['-v0'])
 test('T2817', normal, compile, ['-v0'])
 test('T2713', normal, compile_fail, ['-v0'])
 test('T2674', normal, compile_fail, ['-v0'])
+test('T2931', normal, compile, ['-v0'])
 test('TH_emptycase', normal, compile, ['-v0'])
 
 test('T2386', extra_clean(['T2386_Lib.hi', 'T2386_Lib.o']),
@@ -144,6 +152,7 @@ test('T2685', extra_clean(['T2685a.hi','T2685a.o']),
 test('TH_sections', normal, compile, ['-v0'])
 
 test('TH_tf1', normal, compile, ['-v0'])
+test('TH_tf2', normal, compile, ['-v0'])
 test('TH_tf3', normal, compile, ['-v0'])
 
 test('TH_pragma', normal, compile, ['-v0 -dsuppress-uniques'])
@@ -158,6 +167,7 @@ test('TH_foreignCallingConventions', normal,
 
 test('T3395', normal, compile_fail, ['-v0'])
 test('T3467', normal, compile, [''])
+test('T3572', normal, compile_and_run, [''])
 test('T3100', normal, compile, ['-v0'])
 test('T3920', normal, compile_and_run, ['-v0'])
 
@@ -167,8 +177,10 @@ test('T3845', normal, compile, ['-v0'])
 test('T3899', extra_clean(['T3899a.hi','T3899a.o']),
               multimod_compile,
               ['T3899','-v0 -ddump-splices -dsuppress-uniques ' + config.ghc_th_way_flags])
+test('T4056', normal, compile, ['-v0'])
 test('T4188', normal, compile, ['-v0'])
 test('T4233', normal, compile, ['-v0'])
+test('T4169', normal, compile, ['-v0'])
 test('T1835', normal, compile_and_run, ['-v0'])
 
 test('TH_viewPatPrint', normal, compile_and_run, [''])
@@ -215,6 +227,7 @@ test('T5665', extra_clean(['T5665a.hi','T5665a.o']),
 test('T5700', extra_clean(['T5700a.hi','T5700a.o']),
               multimod_compile,
               ['T5700','-v0 -ddump-splices ' + config.ghc_th_way_flags])
+test('T5721', normal, compile, ['-v0'])
 
 test('TH_PromotedTuple', normal, compile, ['-v0 -ddump-splices -dsuppress-uniques'])
 test('TH_PromotedList', normal, compile, ['-v0'])
@@ -289,12 +302,15 @@ test('T8333',
      run_command,
      ['$MAKE -s --no-print-directory T8333'])
 
+test('T4170', normal, compile, ['-v0'])
 test('T4124', normal, compile, ['-v0'])
 test('T4128', normal, compile, ['-v0'])
+test('T6062', normal, compile, ['-v0'])
 test('T4364', normal, compile, ['-v0'])
 test('T8412', normal, compile_fail, ['-v0'])
 test('T7667', normal, compile, ['-v0'])
 test('T7667a', normal, compile_fail, ['-v0'])
+test('T8455', normal, compile, ['-v0'])
 test('T8499', normal, compile, ['-v0'])
 test('T7477', normal, compile, ['-v0'])
 test('T8507', normal, compile, ['-v0'])
@@ -306,6 +322,7 @@ test('T8577',
      extra_clean(['T8577a.hi', 'T8577a.o']),
      multimod_compile_fail,
      ['T8577', '-v0 ' + config.ghc_th_way_flags])
+test('T8633', normal, compile_and_run, [''])
 test('T8625', normal, ghci_script, ['T8625.script'])
 test('TH_StaticPointers',
      [ when(compiler_lt('ghc', '7.9'), skip) ],
@@ -314,6 +331,7 @@ test('TH_StaticPointers02',
      [ when(compiler_lt('ghc', '7.9'), skip) ],
      compile_fail, [''])
 test('T8759', normal, compile_fail, ['-v0'])
+test('T8759a', normal, compile_fail, ['-v0'])
 test('T7021',
      extra_clean(['T7021a.hi', 'T7021a.o']), multimod_compile, ['T7021','-v0'])
 test('T8807', normal, compile, ['-v0'])
@@ -336,6 +354,7 @@ test('T9209', normal, compile_fail, ['-v0'])
 test('T7484', normal, compile_fail, ['-v0'])
 test('T1476', normal, compile, ['-v0'])
 test('T1476b', normal, compile_fail, ['-v0'])
+test('T9824', normal, compile, ['-v0'])
 test('T8031', normal, compile, ['-v0'])
 test('T8624', normal, run_command, ['$MAKE -s --no-print-directory T8624'])
 test('TH_Lift', normal, compile, ['-v0'])
@@ -343,3 +362,5 @@ test('T10047', normal, ghci_script, ['T10047.script'])
 test('T10019', normal, ghci_script, ['T10019.script'])
 test('T10279', normal, compile_fail, ['-v0'])
 test('T10306', normal, compile, ['-v0'])
+
+test('TH_abstractFamily', normal, compile_fail, [''])