Class layout info (#19623)

Updates the haddock submodule.

8 files changed, 123 insertions, 53 deletions

diff --git a/testsuite/tests/count-deps/CountDepsAst.stdout b/testsuite/tests/count-deps/CountDepsAst.stdout
index 51fb5ec96e..f632445612 100644
--- a/testsuite/tests/count-deps/CountDepsAst.stdout
+++ b/testsuite/tests/count-deps/CountDepsAst.stdout
@@ -295,6 +295,7 @@ GHC.Utils.Trace
 Language.Haskell.Syntax
 Language.Haskell.Syntax.Basic
 Language.Haskell.Syntax.Binds
+Language.Haskell.Syntax.Concrete
 Language.Haskell.Syntax.Decls
 Language.Haskell.Syntax.Expr
 Language.Haskell.Syntax.Extension
diff --git a/testsuite/tests/count-deps/CountDepsParser.stdout b/testsuite/tests/count-deps/CountDepsParser.stdout
index e9c2420d71..85623b21a7 100644
--- a/testsuite/tests/count-deps/CountDepsParser.stdout
+++ b/testsuite/tests/count-deps/CountDepsParser.stdout
@@ -302,6 +302,7 @@ GHC.Utils.Trace
 Language.Haskell.Syntax
 Language.Haskell.Syntax.Basic
 Language.Haskell.Syntax.Binds
+Language.Haskell.Syntax.Concrete
 Language.Haskell.Syntax.Decls
 Language.Haskell.Syntax.Expr
 Language.Haskell.Syntax.Extension
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
index 257d03eb20..212f3f9bec 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
@@ -49,7 +49,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:(5,1)-(6,16) }
@@ -58,9 +58,9 @@
         ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:5:12-16 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (VirtualBraces
-        (3)))
+       (NoAnnSortKey))
+      (VirtualBraces
+       (3))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:5:7-8 })
@@ -186,7 +186,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:(9,1)-(10,16) }
@@ -195,9 +195,9 @@
         ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:9:12-16 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (VirtualBraces
-        (3)))
+       (NoAnnSortKey))
+      (VirtualBraces
+       (3))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:9:7-8 })
@@ -321,7 +321,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:(13,1)-(14,16) }
@@ -330,9 +330,9 @@
         ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:13:12-16 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (VirtualBraces
-        (3)))
+       (NoAnnSortKey))
+      (VirtualBraces
+       (3))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:13:7-8 })
@@ -459,7 +459,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:(17,1)-(20,16) }
@@ -468,9 +468,9 @@
         ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:17:12-16 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (VirtualBraces
-        (3)))
+       (NoAnnSortKey))
+      (VirtualBraces
+       (3))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:17:7-8 })
@@ -648,7 +648,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:22:1-30 }
@@ -659,8 +659,16 @@
         ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:22:30 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (ExplicitBraces))
+       (NoAnnSortKey))
+      (ExplicitBraces
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:22:18 }))
+        (HsTok))
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:22:30 }))
+        (HsTok)))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:22:7-8 })
@@ -917,7 +925,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:28:1-30 }
@@ -928,8 +936,16 @@
         ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:28:30 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (ExplicitBraces))
+       (NoAnnSortKey))
+      (ExplicitBraces
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:28:18 }))
+        (HsTok))
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:28:30 }))
+        (HsTok)))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:28:7-8 })
@@ -1186,7 +1202,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:34:1-30 }
@@ -1197,8 +1213,16 @@
         ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:34:30 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (ExplicitBraces))
+       (NoAnnSortKey))
+      (ExplicitBraces
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:34:18 }))
+        (HsTok))
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:34:30 }))
+        (HsTok)))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:34:7-8 })
@@ -1455,7 +1479,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:40:1-30 }
@@ -1466,8 +1490,16 @@
         ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:40:30 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (ExplicitBraces))
+       (NoAnnSortKey))
+      (ExplicitBraces
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:40:18 }))
+        (HsTok))
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:40:30 }))
+        (HsTok)))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:40:7-8 })
@@ -1724,7 +1756,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:46:1-30 }
@@ -1735,8 +1767,16 @@
         ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:46:30 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (ExplicitBraces))
+       (NoAnnSortKey))
+      (ExplicitBraces
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:46:18 }))
+        (HsTok))
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:46:30 }))
+        (HsTok)))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:46:7-8 })
@@ -1993,7 +2033,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544.hs:52:1-32 }
@@ -2004,8 +2044,16 @@
         ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:52:32 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (ExplicitBraces))
+       (NoAnnSortKey))
+      (ExplicitBraces
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:52:19 }))
+        (HsTok))
+       (L
+        (TokenLoc
+         (EpaSpan { T17544.hs:52:32 }))
+        (HsTok)))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:52:7-9 })
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
index efc2c927ae..28f3f4ef63 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
@@ -269,7 +269,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T17544_kw.hs:(21,1)-(24,18) }
@@ -278,9 +278,9 @@
         ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:23:3-7 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (VirtualBraces
-        (5)))
+       (NoAnnSortKey))
+      (VirtualBraces
+       (5))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:21:7-9 })
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index d3b7566f5d..cd5c002a6a 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -1050,6 +1050,8 @@
        (ClassDecl
         {NameSet:
          []}
+        (VirtualBraces
+         (3))
         (Nothing)
         (L
          (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:27:7 })
diff --git a/testsuite/tests/parser/should_compile/DumpSemis.stderr b/testsuite/tests/parser/should_compile/DumpSemis.stderr
index 9147e29ec4..faa926b6c4 100644
--- a/testsuite/tests/parser/should_compile/DumpSemis.stderr
+++ b/testsuite/tests/parser/should_compile/DumpSemis.stderr
@@ -1048,7 +1048,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { DumpSemis.hs:(28,1)-(29,23) }
@@ -1057,9 +1057,9 @@
         ,(AddEpAnn AnnWhere (EpaSpan { DumpSemis.hs:28:40-44 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (VirtualBraces
-        (3)))
+       (NoAnnSortKey))
+      (VirtualBraces
+       (3))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { DumpSemis.hs:28:7-19 })
@@ -2112,3 +2112,5 @@
                         (NoExtField)))))]))))))]
             (EmptyLocalBinds
              (NoExtField)))))])))))]))
+
+
diff --git a/testsuite/tests/parser/should_compile/T20452.stderr b/testsuite/tests/parser/should_compile/T20452.stderr
index 8cbc6e13c2..0c2982dd9c 100644
--- a/testsuite/tests/parser/should_compile/T20452.stderr
+++ b/testsuite/tests/parser/should_compile/T20452.stderr
@@ -227,7 +227,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T20452.hs:8:1-85 }
@@ -238,8 +238,16 @@
         ,(AddEpAnn AnnCloseC (EpaSpan { T20452.hs:8:85 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (ExplicitBraces))
+       (NoAnnSortKey))
+      (ExplicitBraces
+       (L
+        (TokenLoc
+         (EpaSpan { T20452.hs:8:84 }))
+        (HsTok))
+       (L
+        (TokenLoc
+         (EpaSpan { T20452.hs:8:85 }))
+        (HsTok)))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:8:7-12 })
@@ -413,7 +421,7 @@
     (TyClD
      (NoExtField)
      (ClassDecl
-      ((,,)
+      ((,)
        (EpAnn
         (Anchor
          { T20452.hs:9:1-85 }
@@ -424,8 +432,16 @@
         ,(AddEpAnn AnnCloseC (EpaSpan { T20452.hs:9:85 }))]
         (EpaComments
          []))
-       (NoAnnSortKey)
-       (ExplicitBraces))
+       (NoAnnSortKey))
+      (ExplicitBraces
+       (L
+        (TokenLoc
+         (EpaSpan { T20452.hs:9:84 }))
+        (HsTok))
+       (L
+        (TokenLoc
+         (EpaSpan { T20452.hs:9:85 }))
+        (HsTok)))
       (Nothing)
       (L
        (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:9:7-12 })
diff --git a/testsuite/tests/perf/compiler/hard_hole_fits.stderr b/testsuite/tests/perf/compiler/hard_hole_fits.stderr
index 9565092d29..fcdde2ee2d 100644
--- a/testsuite/tests/perf/compiler/hard_hole_fits.stderr
+++ b/testsuite/tests/perf/compiler/hard_hole_fits.stderr
@@ -180,7 +180,7 @@ hard_hole_fits.hs:23:38: warning: [GHC-88464] [-Wtyped-holes (in -Wdefault)]
         hwcb :: Language.Haskell.Syntax.Type.LHsWcType
                   (Language.Haskell.Syntax.Extension.NoGhcTc GhcPs)
           (bound at hard_hole_fits.hs:23:30)
-        at :: Language.Haskell.Syntax.Extension.LHsToken "@" GhcPs
+        at :: Language.Haskell.Syntax.Concrete.LHsToken "@" GhcPs
           (bound at hard_hole_fits.hs:23:27)
         gl :: LHsExpr GhcPs (bound at hard_hole_fits.hs:23:24)
         xate :: Language.Haskell.Syntax.Extension.XAppTypeE GhcPs
@@ -239,10 +239,10 @@ hard_hole_fits.hs:26:30: warning: [GHC-88464] [-Wtyped-holes (in -Wdefault)]
     • Found hole: _ :: Int
     • In an equation for ‘testMe’: testMe (HsPar xp gl ab ac) = _
     • Relevant bindings include
-        ac :: Language.Haskell.Syntax.Extension.LHsToken ")" GhcPs
+        ac :: Language.Haskell.Syntax.Concrete.LHsToken ")" GhcPs
           (bound at hard_hole_fits.hs:26:24)
         ab :: LHsExpr GhcPs (bound at hard_hole_fits.hs:26:21)
-        gl :: Language.Haskell.Syntax.Extension.LHsToken "(" GhcPs
+        gl :: Language.Haskell.Syntax.Concrete.LHsToken "(" GhcPs
           (bound at hard_hole_fits.hs:26:18)
         xp :: Language.Haskell.Syntax.Extension.XPar GhcPs
           (bound at hard_hole_fits.hs:26:15)
@@ -407,11 +407,11 @@ hard_hole_fits.hs:34:39: warning: [GHC-88464] [-Wtyped-holes (in -Wdefault)]
           testMe (HsLet xl tkLet gl tkIn gl') = _
     • Relevant bindings include
         gl' :: LHsExpr GhcPs (bound at hard_hole_fits.hs:34:32)
-        tkIn :: Language.Haskell.Syntax.Extension.LHsToken "in" GhcPs
+        tkIn :: Language.Haskell.Syntax.Concrete.LHsToken "in" GhcPs
           (bound at hard_hole_fits.hs:34:27)
         gl :: Language.Haskell.Syntax.Binds.HsLocalBinds GhcPs
           (bound at hard_hole_fits.hs:34:24)
-        tkLet :: Language.Haskell.Syntax.Extension.LHsToken "let" GhcPs
+        tkLet :: Language.Haskell.Syntax.Concrete.LHsToken "let" GhcPs
           (bound at hard_hole_fits.hs:34:18)
         xl :: Language.Haskell.Syntax.Extension.XLet GhcPs
           (bound at hard_hole_fits.hs:34:15)