TTG for HsBinds and Data instances Plan B

Summary:
- Add the balance of the TTG extensions for hsSyn/HsBinds

- Move all the (now orphan) data instances into hsSyn/HsInstances and
use TTG Data instances Plan B
https://ghc.haskell.org/trac/ghc/wiki/ImplementingTreesThatGrow/Instances#PLANB

Updates haddock submodule.

Illustrative numbers

Compiling HsInstances before using Plan B.

Max residency ~ 5G
<<ghc: 629,864,691,176 bytes, 5300 GCs,
       321075437/1087762592 avg/max bytes residency (23 samples),
       2953M in use, 0.000 INIT (0.000 elapsed),
       383.511 MUT (384.986 elapsed), 37.426 GC (37.444 elapsed) :ghc>>

Using Plan B

Max residency 1.1G

<<ghc: 78,832,782,968 bytes, 2884 GCs,
       222140352/386470152 avg/max bytes residency (34 samples),
       1062M in use, 0.001 INIT (0.001 elapsed),
       56.612 MUT (62.917 elapsed), 32.974 GC (32.923 elapsed) :ghc>>

Test Plan: ./validate

Reviewers: shayan-najd, goldfire, bgamari

Subscribers: goldfire, thomie, mpickering, carter

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

3 files changed, 19 insertions, 8 deletions

diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index 68ae331fba..100b420227 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -203,6 +203,7 @@
   ,({ DumpParsedAst.hs:11:1-23 }
     (ValD
      (FunBind
+      (PlaceHolder)
       ({ DumpParsedAst.hs:11:1-4 }
        (Unqual
         {OccName: main}))
@@ -238,12 +239,12 @@
                      "\"hello\"")
                     {FastString: "hello"})))))))]
             ({ <no location info> }
-             (EmptyLocalBinds)))))])
+             (EmptyLocalBinds
+              (PlaceHolder))))))])
        []
        (PlaceHolder)
        (FromSource))
       (WpHole)
-      (PlaceHolder)
       [])))]
   (Nothing)
   (Nothing)))
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index 9d6cc6e953..cd6bd9823b 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -11,6 +11,8 @@
        {Bag(Located (HsBind Name)):
         [({ DumpRenamedAst.hs:18:1-23 }
           (FunBind
+           {NameSet:
+            []}
            ({ DumpRenamedAst.hs:18:1-4 }
             {Name: DumpRenamedAst.main})
            (MG
@@ -43,13 +45,12 @@
                           "\"hello\"")
                          {FastString: "hello"})))))))]
                  ({ <no location info> }
-                  (EmptyLocalBinds)))))])
+                  (EmptyLocalBinds
+                   (PlaceHolder))))))])
             []
             (PlaceHolder)
             (FromSource))
            (WpHole)
-           {NameSet:
-            []}
            []))]})]
      []))
    []
diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
index b888067af1..02f0e3c099 100644
--- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
@@ -4,6 +4,7 @@
 {Bag(Located (HsBind Var)):
  [({ <no location info> }
    (VarBind
+    (PlaceHolder)
     {Var: DumpTypecheckedAst.$tcPeano}
     ({ <no location info> }
      (HsApp
@@ -69,6 +70,7 @@
     (False)))
  ,({ <no location info> }
    (VarBind
+    (PlaceHolder)
     {Var: DumpTypecheckedAst.$tc'Zero}
     ({ <no location info> }
      (HsApp
@@ -134,6 +136,7 @@
     (False)))
  ,({ <no location info> }
    (VarBind
+    (PlaceHolder)
     {Var: DumpTypecheckedAst.$tc'Succ}
     ({ <no location info> }
      (HsApp
@@ -199,6 +202,7 @@
     (False)))
  ,({ <no location info> }
    (VarBind
+    (PlaceHolder)
     {Var: $krep}
     ({ <no location info> }
      (HsApp
@@ -223,6 +227,7 @@
     (False)))
  ,({ <no location info> }
    (VarBind
+    (PlaceHolder)
     {Var: $krep}
     ({ <no location info> }
      (HsApp
@@ -252,6 +257,7 @@
     (False)))
  ,({ <no location info> }
    (VarBind
+    (PlaceHolder)
     {Var: DumpTypecheckedAst.$trModule}
     ({ <no location info> }
      (HsApp
@@ -298,9 +304,11 @@
     (False)))
  ,({ DumpTypecheckedAst.hs:11:1-23 }
    (AbsBinds
+    (PlaceHolder)
     []
     []
     [(ABE
+      (PlaceHolder)
       {Var: main}
       {Var: main}
       (WpHole)
@@ -310,6 +318,8 @@
     {Bag(Located (HsBind Var)):
      [({ DumpTypecheckedAst.hs:11:1-23 }
        (FunBind
+        {NameSet:
+         []}
         ({ DumpTypecheckedAst.hs:11:1-4 }
          {Var: main})
         (MG
@@ -342,7 +352,8 @@
                        "\"hello\"")
                       {FastString: "hello"})))))))]
               ({ <no location info> }
-               (EmptyLocalBinds)))))])
+               (EmptyLocalBinds
+                (PlaceHolder))))))])
          []
          (TyConApp
           ({abstract:TyCon})
@@ -351,8 +362,6 @@
             [])])
          (FromSource))
         (WpHole)
-        {NameSet:
-         []}
         []))]}
     (False)))]}