Restore Trees That Grow reverted commits

The following commits were reverted prior to the release of GHC 8.4.1,
because the time to derive Data instances was too long [1].

 438dd1cbba13d35f3452b4dcef3f94ce9a216905 Phab:D4147
 e3ec2e7ae94524ebd111963faf34b84d942265b4 Phab:D4177
 47ad6578ea460999b53eb4293c3a3b3017a56d65 Phab:D4186

The work is continuing, as the minimum bootstrap compiler is now
GHC 8.2.1, and this allows Plan B[2] for instances to be used.  This
will land in a following commit.

Updates Haddock submodule

[1] https://ghc.haskell.org/trac/ghc/wiki/ImplementingTreesThatGrow/Instances
[2] https://ghc.haskell.org/trac/ghc/wiki/ImplementingTreesThatGrow/Instances#PLANB

9 files changed, 217 insertions, 61 deletions

diff --git a/testsuite/tests/ghc-api/annotations/parseTree.hs b/testsuite/tests/ghc-api/annotations/parseTree.hs
index 3a8a29abd4..b04be775c3 100644
--- a/testsuite/tests/ghc-api/annotations/parseTree.hs
+++ b/testsuite/tests/ghc-api/annotations/parseTree.hs
@@ -51,8 +51,10 @@ testOneFile libdir fileName = do
      gq ast = everything (++) ([] `mkQ` doLHsTupArg) ast
 
      doLHsTupArg :: LHsTupArg GhcPs -> [(SrcSpan,String,HsExpr GhcPs)]
-     doLHsTupArg (L l arg@(Present _)) = [(l,"p",ExplicitTuple [L l arg] Boxed)]
-     doLHsTupArg (L l arg@(Missing _)) = [(l,"m",ExplicitTuple [L l arg] Boxed)]
+     doLHsTupArg (L l arg@(Present {}))
+                                = [(l,"p",ExplicitTuple noExt [L l arg] Boxed)]
+     doLHsTupArg (L l arg@(Missing {}))
+                                = [(l,"m",ExplicitTuple noExt [L l arg] Boxed)]
 
 
 showAnns anns = "[\n" ++ (intercalate "\n"
diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs
index b89911d6c7..4089d4a88a 100644
--- a/testsuite/tests/ghc-api/annotations/stringSource.hs
+++ b/testsuite/tests/ghc-api/annotations/stringSource.hs
@@ -80,9 +80,9 @@ testOneFile libdir fileName = do
      doCCallTarget (StaticTarget s f _ _) = [("st",[(noLoc (s,f))])]
 
      doHsExpr :: HsExpr GhcPs -> [(String,[Located (SourceText,FastString)])]
-     doHsExpr (HsCoreAnn src ss _) = [("co",[conv (noLoc ss)])]
-     doHsExpr (HsSCC     src ss _) = [("sc",[conv (noLoc ss)])]
-     doHsExpr (HsTickPragma src (ss,_,_) _ss2 _) = [("tp",[conv (noLoc ss)])]
+     doHsExpr (HsCoreAnn _ src ss _) = [("co",[conv (noLoc ss)])]
+     doHsExpr (HsSCC     _ src ss _) = [("sc",[conv (noLoc ss)])]
+     doHsExpr (HsTickPragma _ src (ss,_,_) _ss2 _) = [("tp",[conv (noLoc ss)])]
      doHsExpr _ = []
 
      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 4b8119459b..40d23b5712 100644
--- a/testsuite/tests/ghc-api/annotations/t11430.hs
+++ b/testsuite/tests/ghc-api/annotations/t11430.hs
@@ -67,7 +67,7 @@ testOneFile libdir fileName = do
      doRuleDecl (HsRule _ _ _ _ _ _ _) = []
 
      doHsExpr :: HsExpr GhcPs -> [(String,[String])]
-     doHsExpr (HsTickPragma src (_,_,_) ss _) = [("tp",[show ss])]
+     doHsExpr (HsTickPragma _ src (_,_,_) ss _) = [("tp",[show ss])]
      doHsExpr _ = []
 
      doInline (InlinePragma _ _ _ (ActiveBefore (SourceText ss) _) _)
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index 127f28ac4e..68ae331fba 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -47,6 +47,7 @@
           (PrefixCon
            [({ DumpParsedAst.hs:5:26-30 }
              (HsTyVar
+              (PlaceHolder)
               (NotPromoted)
               ({ DumpParsedAst.hs:5:26-30 }
                (Unqual
@@ -71,25 +72,32 @@
                {OccName: Length}))
              [({ DumpParsedAst.hs:8:10-17 }
                (HsParTy
+                (PlaceHolder)
                 ({ DumpParsedAst.hs:8:11-16 }
                  (HsAppsTy
+                  (PlaceHolder)
                   [({ DumpParsedAst.hs:8:11 }
                     (HsAppPrefix
+                     (PlaceHolder)
                      ({ DumpParsedAst.hs:8:11 }
                       (HsTyVar
+                       (PlaceHolder)
                        (NotPromoted)
                        ({ DumpParsedAst.hs:8:11 }
                         (Unqual
                          {OccName: a}))))))
                   ,({ DumpParsedAst.hs:8:13 }
                     (HsAppInfix
+                     (PlaceHolder)
                      ({ DumpParsedAst.hs:8:13 }
                       (Exact
                        {Name: :}))))
                   ,({ DumpParsedAst.hs:8:15-16 }
                     (HsAppPrefix
+                     (PlaceHolder)
                      ({ DumpParsedAst.hs:8:15-16 }
                       (HsTyVar
+                       (PlaceHolder)
                        (NotPromoted)
                        ({ DumpParsedAst.hs:8:15-16 }
                         (Unqual
@@ -97,32 +105,42 @@
              (Prefix)
              ({ DumpParsedAst.hs:8:21-36 }
               (HsAppsTy
+               (PlaceHolder)
                [({ DumpParsedAst.hs:8:21-24 }
                  (HsAppPrefix
+                  (PlaceHolder)
                   ({ DumpParsedAst.hs:8:21-24 }
                    (HsTyVar
+                    (PlaceHolder)
                     (NotPromoted)
                     ({ DumpParsedAst.hs:8:21-24 }
                      (Unqual
                       {OccName: Succ}))))))
                ,({ DumpParsedAst.hs:8:26-36 }
                  (HsAppPrefix
+                  (PlaceHolder)
                   ({ DumpParsedAst.hs:8:26-36 }
                    (HsParTy
+                    (PlaceHolder)
                     ({ DumpParsedAst.hs:8:27-35 }
                      (HsAppsTy
+                      (PlaceHolder)
                       [({ DumpParsedAst.hs:8:27-32 }
                         (HsAppPrefix
+                         (PlaceHolder)
                          ({ DumpParsedAst.hs:8:27-32 }
                           (HsTyVar
+                           (PlaceHolder)
                            (NotPromoted)
                            ({ DumpParsedAst.hs:8:27-32 }
                             (Unqual
                              {OccName: Length}))))))
                       ,({ DumpParsedAst.hs:8:34-35 }
                         (HsAppPrefix
+                         (PlaceHolder)
                          ({ DumpParsedAst.hs:8:34-35 }
                           (HsTyVar
+                           (PlaceHolder)
                            (NotPromoted)
                            ({ DumpParsedAst.hs:8:34-35 }
                             (Unqual
@@ -137,12 +155,13 @@
                {OccName: Length}))
              [({ DumpParsedAst.hs:9:10-12 }
                (HsExplicitListTy
-                (Promoted)
                 (PlaceHolder)
+                (Promoted)
                 []))]
              (Prefix)
              ({ DumpParsedAst.hs:9:21-24 }
               (HsTyVar
+               (PlaceHolder)
                (NotPromoted)
                ({ DumpParsedAst.hs:9:21-24 }
                 (Unqual
@@ -155,13 +174,16 @@
         (PlaceHolder)
         [({ DumpParsedAst.hs:7:20-30 }
           (KindedTyVar
+           (PlaceHolder)
            ({ DumpParsedAst.hs:7:21-22 }
             (Unqual
              {OccName: as}))
            ({ DumpParsedAst.hs:7:27-29 }
             (HsListTy
+             (PlaceHolder)
              ({ DumpParsedAst.hs:7:28 }
               (HsTyVar
+               (PlaceHolder)
                (NotPromoted)
                ({ DumpParsedAst.hs:7:28 }
                 (Unqual
@@ -172,6 +194,7 @@
         (KindSig
          ({ DumpParsedAst.hs:7:35-39 }
           (HsTyVar
+           (PlaceHolder)
            (NotPromoted)
            ({ DumpParsedAst.hs:7:35-39 }
             (Unqual
@@ -200,13 +223,16 @@
                []
                ({ DumpParsedAst.hs:11:8-23 }
                 (HsApp
+                 (PlaceHolder)
                  ({ DumpParsedAst.hs:11:8-15 }
                   (HsVar
+                   (PlaceHolder)
                    ({ DumpParsedAst.hs:11:8-15 }
                     (Unqual
                      {OccName: putStrLn}))))
                  ({ DumpParsedAst.hs:11:17-23 }
                   (HsLit
+                   (PlaceHolder)
                    (HsString
                     (SourceText
                      "\"hello\"")
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index 3ddb5ed462..9d6cc6e953 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -4,50 +4,54 @@
 (Just
  ((,,,)
   (HsGroup
-   (ValBindsOut
-    [((,)
-      (NonRecursive)
-      {Bag(Located (HsBind Name)):
-       [({ DumpRenamedAst.hs:18:1-23 }
-         (FunBind
-          ({ DumpRenamedAst.hs:18:1-4 }
-           {Name: DumpRenamedAst.main})
-          (MG
-           ({ DumpRenamedAst.hs:18:1-23 }
-            [({ DumpRenamedAst.hs:18:1-23 }
-              (Match
-               (FunRhs
-                ({ DumpRenamedAst.hs:18:1-4 }
-                 {Name: DumpRenamedAst.main})
-                (Prefix)
-                (NoSrcStrict))
-               []
-               (GRHSs
-                [({ DumpRenamedAst.hs:18:6-23 }
-                  (GRHS
-                   []
-                   ({ DumpRenamedAst.hs:18:8-23 }
-                    (HsApp
-                     ({ DumpRenamedAst.hs:18:8-15 }
-                      (HsVar
-                       ({ DumpRenamedAst.hs:18:8-15 }
-                        {Name: System.IO.putStrLn})))
-                     ({ DumpRenamedAst.hs:18:17-23 }
-                      (HsLit
-                       (HsString
-                        (SourceText
-                         "\"hello\"")
-                        {FastString: "hello"})))))))]
-                ({ <no location info> }
-                 (EmptyLocalBinds)))))])
-           []
-           (PlaceHolder)
-           (FromSource))
-          (WpHole)
-          {NameSet:
-           []}
-          []))]})]
-    [])
+   (XValBindsLR
+    (NValBinds
+     [((,)
+       (NonRecursive)
+       {Bag(Located (HsBind Name)):
+        [({ DumpRenamedAst.hs:18:1-23 }
+          (FunBind
+           ({ DumpRenamedAst.hs:18:1-4 }
+            {Name: DumpRenamedAst.main})
+           (MG
+            ({ DumpRenamedAst.hs:18:1-23 }
+             [({ DumpRenamedAst.hs:18:1-23 }
+               (Match
+                (FunRhs
+                 ({ DumpRenamedAst.hs:18:1-4 }
+                  {Name: DumpRenamedAst.main})
+                 (Prefix)
+                 (NoSrcStrict))
+                []
+                (GRHSs
+                 [({ DumpRenamedAst.hs:18:6-23 }
+                   (GRHS
+                    []
+                    ({ DumpRenamedAst.hs:18:8-23 }
+                     (HsApp
+                      (PlaceHolder)
+                      ({ DumpRenamedAst.hs:18:8-15 }
+                       (HsVar
+                        (PlaceHolder)
+                        ({ DumpRenamedAst.hs:18:8-15 }
+                         {Name: System.IO.putStrLn})))
+                      ({ DumpRenamedAst.hs:18:17-23 }
+                       (HsLit
+                        (PlaceHolder)
+                        (HsString
+                         (SourceText
+                          "\"hello\"")
+                         {FastString: "hello"})))))))]
+                 ({ <no location info> }
+                  (EmptyLocalBinds)))))])
+            []
+            (PlaceHolder)
+            (FromSource))
+           (WpHole)
+           {NameSet:
+            []}
+           []))]})]
+     []))
    []
    [(TyClGroup
      [({ DumpRenamedAst.hs:6:1-30 }
@@ -86,6 +90,7 @@
             (PrefixCon
              [({ DumpRenamedAst.hs:6:26-30 }
                (HsTyVar
+                (PlaceHolder)
                 (NotPromoted)
                 ({ DumpRenamedAst.hs:6:26-30 }
                  {Name: DumpRenamedAst.Peano})))])
@@ -112,10 +117,13 @@
                 {Name: DumpRenamedAst.Length})
                [({ DumpRenamedAst.hs:9:10-17 }
                  (HsParTy
+                  (PlaceHolder)
                   ({ DumpRenamedAst.hs:9:11-16 }
                    (HsOpTy
+                    (PlaceHolder)
                     ({ DumpRenamedAst.hs:9:11 }
                      (HsTyVar
+                      (PlaceHolder)
                       (NotPromoted)
                       ({ DumpRenamedAst.hs:9:11 }
                        {Name: a})))
@@ -123,28 +131,35 @@
                      {Name: :})
                     ({ DumpRenamedAst.hs:9:15-16 }
                      (HsTyVar
+                      (PlaceHolder)
                       (NotPromoted)
                       ({ DumpRenamedAst.hs:9:15-16 }
                        {Name: as})))))))]
                (Prefix)
                ({ DumpRenamedAst.hs:9:21-36 }
                 (HsAppTy
+                 (PlaceHolder)
                  ({ DumpRenamedAst.hs:9:21-24 }
                   (HsTyVar
+                   (PlaceHolder)
                    (NotPromoted)
                    ({ DumpRenamedAst.hs:9:21-24 }
                     {Name: DumpRenamedAst.Succ})))
                  ({ DumpRenamedAst.hs:9:26-36 }
                   (HsParTy
+                   (PlaceHolder)
                    ({ DumpRenamedAst.hs:9:27-35 }
                     (HsAppTy
+                     (PlaceHolder)
                      ({ DumpRenamedAst.hs:9:27-32 }
                       (HsTyVar
+                       (PlaceHolder)
                        (NotPromoted)
                        ({ DumpRenamedAst.hs:9:27-32 }
                         {Name: DumpRenamedAst.Length})))
                      ({ DumpRenamedAst.hs:9:34-35 }
                       (HsTyVar
+                       (PlaceHolder)
                        (NotPromoted)
                        ({ DumpRenamedAst.hs:9:34-35 }
                         {Name: as}))))))))))
@@ -157,12 +172,13 @@
                 {Name: DumpRenamedAst.Length})
                [({ DumpRenamedAst.hs:10:10-12 }
                  (HsExplicitListTy
-                  (Promoted)
                   (PlaceHolder)
+                  (Promoted)
                   []))]
                (Prefix)
                ({ DumpRenamedAst.hs:10:21-24 }
                 (HsTyVar
+                 (PlaceHolder)
                  (NotPromoted)
                  ({ DumpRenamedAst.hs:10:21-24 }
                   {Name: DumpRenamedAst.Zero}))))
@@ -173,12 +189,15 @@
           [{Name: k}]
           [({ DumpRenamedAst.hs:8:20-30 }
             (KindedTyVar
+             (PlaceHolder)
              ({ DumpRenamedAst.hs:8:21-22 }
               {Name: as})
              ({ DumpRenamedAst.hs:8:27-29 }
               (HsListTy
+               (PlaceHolder)
                ({ DumpRenamedAst.hs:8:28 }
                 (HsTyVar
+                 (PlaceHolder)
                  (NotPromoted)
                  ({ DumpRenamedAst.hs:8:28 }
                   {Name: k})))))))]
@@ -189,6 +208,7 @@
           (KindSig
            ({ DumpRenamedAst.hs:8:35-39 }
             (HsTyVar
+             (PlaceHolder)
              (NotPromoted)
              ({ DumpRenamedAst.hs:8:35-39 }
               {Name: DumpRenamedAst.Peano})))))
@@ -212,20 +232,25 @@
           (KindSig
            ({ DumpRenamedAst.hs:12:20-30 }
             (HsFunTy
+             (PlaceHolder)
              ({ DumpRenamedAst.hs:12:20 }
               (HsTyVar
+               (PlaceHolder)
                (NotPromoted)
                ({ DumpRenamedAst.hs:12:20 }
                 {Name: k})))
              ({ DumpRenamedAst.hs:12:25-30 }
               (HsFunTy
+               (PlaceHolder)
                ({ DumpRenamedAst.hs:12:25 }
                 (HsTyVar
+                 (PlaceHolder)
                  (NotPromoted)
                  ({ DumpRenamedAst.hs:12:25 }
                   {Name: k})))
                ({ DumpRenamedAst.hs:12:30 }
                 (HsTyVar
+                 (PlaceHolder)
                  (NotPromoted)
                  ({ DumpRenamedAst.hs:12:30 }
                   {Name: GHC.Types.*})))))))))
@@ -242,20 +267,25 @@
             {Name: DumpRenamedAst.Nat})
            [({ DumpRenamedAst.hs:15:22-34 }
              (HsKindSig
+              (PlaceHolder)
               ({ DumpRenamedAst.hs:15:23 }
                (HsTyVar
+                (PlaceHolder)
                 (NotPromoted)
                 ({ DumpRenamedAst.hs:15:23 }
                  {Name: a})))
               ({ DumpRenamedAst.hs:15:28-33 }
                (HsFunTy
+                (PlaceHolder)
                 ({ DumpRenamedAst.hs:15:28 }
                  (HsTyVar
+                  (PlaceHolder)
                   (NotPromoted)
                   ({ DumpRenamedAst.hs:15:28 }
                    {Name: k})))
                 ({ DumpRenamedAst.hs:15:33 }
                  (HsTyVar
+                  (PlaceHolder)
                   (NotPromoted)
                   ({ DumpRenamedAst.hs:15:33 }
                    {Name: GHC.Types.*})))))))]
@@ -268,22 +298,28 @@
             (Just
              ({ DumpRenamedAst.hs:15:39-51 }
               (HsFunTy
+               (PlaceHolder)
                ({ DumpRenamedAst.hs:15:39-46 }
                 (HsParTy
+                 (PlaceHolder)
                  ({ DumpRenamedAst.hs:15:40-45 }
                   (HsFunTy
+                   (PlaceHolder)
                    ({ DumpRenamedAst.hs:15:40 }
                     (HsTyVar
+                     (PlaceHolder)
                      (NotPromoted)
                      ({ DumpRenamedAst.hs:15:40 }
                       {Name: k})))
                    ({ DumpRenamedAst.hs:15:45 }
                     (HsTyVar
+                     (PlaceHolder)
                      (NotPromoted)
                      ({ DumpRenamedAst.hs:15:45 }
                       {Name: GHC.Types.*})))))))
                ({ DumpRenamedAst.hs:15:51 }
                 (HsTyVar
+                 (PlaceHolder)
                  (NotPromoted)
                  ({ DumpRenamedAst.hs:15:51 }
                   {Name: GHC.Types.*}))))))
@@ -302,54 +338,69 @@
                (PrefixCon
                 [({ DumpRenamedAst.hs:16:10-34 }
                   (HsParTy
+                   (PlaceHolder)
                    ({ DumpRenamedAst.hs:16:11-33 }
                     (HsForAllTy
+                     (PlaceHolder)
                      [({ DumpRenamedAst.hs:16:18-19 }
                        (UserTyVar
+                        (PlaceHolder)
                         ({ DumpRenamedAst.hs:16:18-19 }
                          {Name: xx})))]
                      ({ DumpRenamedAst.hs:16:22-33 }
                       (HsFunTy
+                       (PlaceHolder)
                        ({ DumpRenamedAst.hs:16:22-25 }
                         (HsAppTy
+                         (PlaceHolder)
                          ({ DumpRenamedAst.hs:16:22 }
                           (HsTyVar
+                           (PlaceHolder)
                            (NotPromoted)
                            ({ DumpRenamedAst.hs:16:22 }
                             {Name: f})))
                          ({ DumpRenamedAst.hs:16:24-25 }
                           (HsTyVar
+                           (PlaceHolder)
                            (NotPromoted)
                            ({ DumpRenamedAst.hs:16:24-25 }
                             {Name: xx})))))
                        ({ DumpRenamedAst.hs:16:30-33 }
                         (HsAppTy
+                         (PlaceHolder)
                          ({ DumpRenamedAst.hs:16:30 }
                           (HsTyVar
+                           (PlaceHolder)
                            (NotPromoted)
                            ({ DumpRenamedAst.hs:16:30 }
                             {Name: g})))
                          ({ DumpRenamedAst.hs:16:32-33 }
                           (HsTyVar
+                           (PlaceHolder)
                            (NotPromoted)
                            ({ DumpRenamedAst.hs:16:32-33 }
                             {Name: xx})))))))))))])
                ({ DumpRenamedAst.hs:16:39-45 }
                 (HsAppTy
+                 (PlaceHolder)
                  ({ DumpRenamedAst.hs:16:39-43 }
                   (HsAppTy
+                   (PlaceHolder)
                    ({ DumpRenamedAst.hs:16:39-41 }
                     (HsTyVar
+                     (PlaceHolder)
                      (NotPromoted)
                      ({ DumpRenamedAst.hs:16:39-41 }
                       {Name: DumpRenamedAst.Nat})))
                    ({ DumpRenamedAst.hs:16:43 }
                     (HsTyVar
+                     (PlaceHolder)
                      (NotPromoted)
                      ({ DumpRenamedAst.hs:16:43 }
                       {Name: f})))))
                  ({ DumpRenamedAst.hs:16:45 }
                   (HsTyVar
+                   (PlaceHolder)
                    (NotPromoted)
                    ({ DumpRenamedAst.hs:16:45 }
                     {Name: g})))))
diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
index e0d810d4b4..b888067af1 100644
--- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
@@ -7,47 +7,63 @@
     {Var: DumpTypecheckedAst.$tcPeano}
     ({ <no location info> }
      (HsApp
+      (PlaceHolder)
       ({ <no location info> }
        (HsApp
+        (PlaceHolder)
         ({ <no location info> }
          (HsApp
+          (PlaceHolder)
           ({ <no location info> }
            (HsApp
+            (PlaceHolder)
             ({ <no location info> }
              (HsApp
+              (PlaceHolder)
               ({ <no location info> }
                (HsApp
+                (PlaceHolder)
                 ({ <no location info> }
                  (HsConLikeOut
+                  (PlaceHolder)
                   ({abstract:ConLike})))
                 ({ <no location info> }
                  (HsLit
+                  (PlaceHolder)
                   {HsWord{64}Prim (14073232900889011755) (NoSourceText)}))))
               ({ <no location info> }
                (HsLit
+                (PlaceHolder)
                 {HsWord{64}Prim (2739668351064589274) (NoSourceText)}))))
             ({ <no location info> }
              (HsVar
+              (PlaceHolder)
               ({ <no location info> }
                {Var: DumpTypecheckedAst.$trModule})))))
           ({ <no location info> }
            (HsPar
+            (PlaceHolder)
             ({ <no location info> }
              (HsApp
+              (PlaceHolder)
               ({ <no location info> }
                (HsConLikeOut
+                (PlaceHolder)
                 ({abstract:ConLike})))
               ({ <no location info> }
                (HsLit
+                (PlaceHolder)
                 (HsStringPrim
                  (NoSourceText)
                  "Peano")))))))))
         ({ <no location info> }
          (HsLit
+          (PlaceHolder)
           {HsInt{64}Prim (0) (SourceText
                               "0")}))))
       ({ <no location info> }
        (HsVar
+        (PlaceHolder)
         ({ <no location info> }
          {Var: GHC.Types.krep$*})))))
     (False)))
@@ -56,47 +72,63 @@
     {Var: DumpTypecheckedAst.$tc'Zero}
     ({ <no location info> }
      (HsApp
+      (PlaceHolder)
       ({ <no location info> }
        (HsApp
+        (PlaceHolder)
         ({ <no location info> }
          (HsApp
+          (PlaceHolder)
           ({ <no location info> }
            (HsApp
+            (PlaceHolder)
             ({ <no location info> }
              (HsApp
+              (PlaceHolder)
               ({ <no location info> }
                (HsApp
+                (PlaceHolder)
                 ({ <no location info> }
                  (HsConLikeOut
+                  (PlaceHolder)
                   ({abstract:ConLike})))
                 ({ <no location info> }
                  (HsLit
+                  (PlaceHolder)
                   {HsWord{64}Prim (13760111476013868540) (NoSourceText)}))))
               ({ <no location info> }
                (HsLit
+                (PlaceHolder)
                 {HsWord{64}Prim (12314848029315386153) (NoSourceText)}))))
             ({ <no location info> }
              (HsVar
+              (PlaceHolder)
               ({ <no location info> }
                {Var: DumpTypecheckedAst.$trModule})))))
           ({ <no location info> }
            (HsPar
+            (PlaceHolder)
             ({ <no location info> }
              (HsApp
+              (PlaceHolder)
               ({ <no location info> }
                (HsConLikeOut
+                (PlaceHolder)
                 ({abstract:ConLike})))
               ({ <no location info> }
                (HsLit
+                (PlaceHolder)
                 (HsStringPrim
                  (NoSourceText)
                  "'Zero")))))))))
         ({ <no location info> }
          (HsLit
+          (PlaceHolder)
           {HsInt{64}Prim (0) (SourceText
                               "0")}))))
       ({ <no location info> }
        (HsVar
+        (PlaceHolder)
         ({ <no location info> }
          {Var: $krep})))))
     (False)))
@@ -105,47 +137,63 @@
     {Var: DumpTypecheckedAst.$tc'Succ}
     ({ <no location info> }
      (HsApp
+      (PlaceHolder)
       ({ <no location info> }
        (HsApp
+        (PlaceHolder)
         ({ <no location info> }
          (HsApp
+          (PlaceHolder)
           ({ <no location info> }
            (HsApp
+            (PlaceHolder)
             ({ <no location info> }
              (HsApp
+              (PlaceHolder)
               ({ <no location info> }
                (HsApp
+                (PlaceHolder)
                 ({ <no location info> }
                  (HsConLikeOut
+                  (PlaceHolder)
                   ({abstract:ConLike})))
                 ({ <no location info> }
                  (HsLit
+                  (PlaceHolder)
                   {HsWord{64}Prim (1143980031331647856) (NoSourceText)}))))
               ({ <no location info> }
                (HsLit
+                (PlaceHolder)
                 {HsWord{64}Prim (14802086722010293686) (NoSourceText)}))))
             ({ <no location info> }
              (HsVar
+              (PlaceHolder)
               ({ <no location info> }
                {Var: DumpTypecheckedAst.$trModule})))))
           ({ <no location info> }
            (HsPar
+            (PlaceHolder)
             ({ <no location info> }
              (HsApp
+              (PlaceHolder)
               ({ <no location info> }
                (HsConLikeOut
+                (PlaceHolder)
                 ({abstract:ConLike})))
               ({ <no location info> }
                (HsLit
+                (PlaceHolder)
                 (HsStringPrim
                  (NoSourceText)
                  "'Succ")))))))))
         ({ <no location info> }
          (HsLit
+          (PlaceHolder)
           {HsInt{64}Prim (0) (SourceText
                               "0")}))))
       ({ <no location info> }
        (HsVar
+        (PlaceHolder)
         ({ <no location info> }
          {Var: $krep})))))
     (False)))
@@ -154,17 +202,22 @@
     {Var: $krep}
     ({ <no location info> }
      (HsApp
+      (PlaceHolder)
       ({ <no location info> }
        (HsApp
+        (PlaceHolder)
         ({ <no location info> }
          (HsConLikeOut
+          (PlaceHolder)
           ({abstract:ConLike})))
         ({ <no location info> }
          (HsVar
+          (PlaceHolder)
           ({ <no location info> }
            {Var: $krep})))))
       ({ <no location info> }
        (HsVar
+        (PlaceHolder)
         ({ <no location info> }
          {Var: $krep})))))
     (False)))
@@ -173,22 +226,28 @@
     {Var: $krep}
     ({ <no location info> }
      (HsApp
+      (PlaceHolder)
       ({ <no location info> }
        (HsApp
+        (PlaceHolder)
         ({ <no location info> }
          (HsConLikeOut
+          (PlaceHolder)
           ({abstract:ConLike})))
         ({ <no location info> }
          (HsVar
+          (PlaceHolder)
           ({ <no location info> }
            {Var: DumpTypecheckedAst.$tcPeano})))))
       ({ <no location info> }
        (HsWrap
+        (PlaceHolder)
         (WpTyApp
          (TyConApp
           ({abstract:TyCon})
           []))
         (HsConLikeOut
+         (PlaceHolder)
          ({abstract:ConLike}))))))
     (False)))
  ,({ <no location info> }
@@ -196,32 +255,43 @@
     {Var: DumpTypecheckedAst.$trModule}
     ({ <no location info> }
      (HsApp
+      (PlaceHolder)
       ({ <no location info> }
        (HsApp
+        (PlaceHolder)
         ({ <no location info> }
          (HsConLikeOut
+          (PlaceHolder)
           ({abstract:ConLike})))
         ({ <no location info> }
          (HsPar
+          (PlaceHolder)
           ({ <no location info> }
            (HsApp
+            (PlaceHolder)
             ({ <no location info> }
              (HsConLikeOut
+              (PlaceHolder)
               ({abstract:ConLike})))
             ({ <no location info> }
              (HsLit
+              (PlaceHolder)
               (HsStringPrim
                (NoSourceText)
                "main")))))))))
       ({ <no location info> }
        (HsPar
+        (PlaceHolder)
         ({ <no location info> }
          (HsApp
+          (PlaceHolder)
           ({ <no location info> }
            (HsConLikeOut
+            (PlaceHolder)
             ({abstract:ConLike})))
           ({ <no location info> }
            (HsLit
+            (PlaceHolder)
             (HsStringPrim
              (NoSourceText)
              "DumpTypecheckedAst")))))))))
@@ -258,12 +328,15 @@
                  []
                  ({ DumpTypecheckedAst.hs:11:8-23 }
                   (HsApp
+                   (PlaceHolder)
                    ({ DumpTypecheckedAst.hs:11:8-15 }
                     (HsVar
+                     (PlaceHolder)
                      ({ <no location info> }
                       {Var: putStrLn})))
                    ({ DumpTypecheckedAst.hs:11:17-23 }
                     (HsLit
+                     (PlaceHolder)
                      (HsString
                       (SourceText
                        "\"hello\"")
diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr
index 439c5ff135..2d0eb5ec67 100644
--- a/testsuite/tests/parser/should_compile/T14189.stderr
+++ b/testsuite/tests/parser/should_compile/T14189.stderr
@@ -4,9 +4,10 @@
 (Just
  ((,,,)
   (HsGroup
-   (ValBindsOut
-    []
-    [])
+   (XValBindsLR
+    (NValBinds
+      []
+      []))
    []
    [(TyClGroup
      [({ T14189.hs:6:1-42 }
@@ -35,6 +36,7 @@
             (PrefixCon
              [({ T14189.hs:6:18-20 }
                (HsTyVar
+                (PlaceHolder)
                 (NotPromoted)
                 ({ T14189.hs:6:18-20 }
                  {Name: GHC.Types.Int})))])
@@ -62,12 +64,13 @@
                 (ConDeclField
                  [({ T14189.hs:6:33 }
                    (FieldOcc
+                    {Name: T14189.f}
                     ({ T14189.hs:6:33 }
                      (Unqual
-                      {OccName: f}))
-                    {Name: T14189.f}))]
+                      {OccName: f}))))]
                  ({ T14189.hs:6:38-40 }
                   (HsTyVar
+                   (PlaceHolder)
                    (NotPromoted)
                    ({ T14189.hs:6:38-40 }
                     {Name: GHC.Types.Int})))
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 941adf1ee8..21d9e18245 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -151,7 +151,7 @@ test('haddock.compiler',
      ,stats_num_field('bytes allocated',
           [(platform('x86_64-unknown-mingw32'),   56775301896, 10),
             # 2017-12-24:                     56775301896 (x64/Windows)
-            (wordsize(64), 51592019560, 10)
+            (wordsize(64), 91115212032, 10)
             # 2012-08-14: 26070600504 (amd64/Linux)
             # 2012-08-29: 26353100288 (amd64/Linux, new CG)
             # 2012-09-18: 26882813032 (amd64/Linux)
@@ -173,6 +173,7 @@ test('haddock.compiler',
             # 2017-06-05: 65378619232 (amd64/Linux) Desugar modules compiled with -fno-code
             # 2017-06-06: 55990521024 (amd64/Linux) Don't pass on -dcore-lint in Haddock.mk
             # 2017-07-12: 51592019560 (amd64/Linux) Use getNameToInstancesIndex
+            # 2018-04-08: 91115212032 (amd64/Linux) Trees that grow
 
           ,(platform('i386-unknown-mingw32'),   367546388, 10)
             # 2012-10-30:                     13773051312 (x86/Windows)
diff --git a/testsuite/tests/quasiquotation/T7918.hs b/testsuite/tests/quasiquotation/T7918.hs
index 42bb1b05c8..9cf060937e 100644
--- a/testsuite/tests/quasiquotation/T7918.hs
+++ b/testsuite/tests/quasiquotation/T7918.hs
@@ -29,19 +29,19 @@ traverse a =
       gmapM traverse a
   where
     showVar :: Maybe (HsExpr GhcTc) -> Traverse ()
-    showVar (Just (HsVar (L _ v))) =
+    showVar (Just (HsVar _ (L _ v))) =
       modify $ \(loc, ids) -> (loc, (varName v, loc) : ids)
     showVar _ =
       return ()
 
     showTyVar :: Maybe (HsType GhcRn) -> Traverse ()
-    showTyVar (Just (HsTyVar _ (L _ v))) =
+    showTyVar (Just (HsTyVar _ _ (L _ v))) =
       modify $ \(loc, ids) -> (loc, (v, loc) : ids)
     showTyVar _ =
       return ()
 
     showPatVar :: Maybe (Pat GhcTc) -> Traverse ()
-    showPatVar (Just (VarPat (L _ v))) =
+    showPatVar (Just (VarPat _ (L _ v))) =
       modify $ \(loc, ids) -> (loc, (varName v, loc) : ids)
     showPatVar _
       = return ()