From 4257a68c277470b4cf050f736340630c70934387 Mon Sep 17 00:00:00 2001
From: Max Schaefer <max-schaefer@github.com>
Date: Fri, 10 Jul 2020 14:08:37 +0100
Subject: [PATCH 1/3] Include newlines in messages printed by
 `go-gen-dbscheme`.

---
 extractor/cli/go-gen-dbscheme/go-gen-dbscheme.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extractor/cli/go-gen-dbscheme/go-gen-dbscheme.go b/extractor/cli/go-gen-dbscheme/go-gen-dbscheme.go
index 2a757b47f5b..94831c2b451 100644
--- a/extractor/cli/go-gen-dbscheme/go-gen-dbscheme.go
+++ b/extractor/cli/go-gen-dbscheme/go-gen-dbscheme.go
@@ -22,10 +22,10 @@ func main() {
 
 	f, err := os.Create(out)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to open file %s for writing.", out)
+		fmt.Fprintf(os.Stderr, "Unable to open file %s for writing.\n", out)
 		os.Exit(1)
 	}
 	dbscheme.PrintDbScheme(f)
 	f.Close()
-	fmt.Printf("Dbscheme written to file %s.", out)
+	fmt.Printf("Dbscheme written to file %s.\n", out)
 }

From 1a8688a8f4452ca5dfe6cdd4acf49865b6c5604c Mon Sep 17 00:00:00 2001
From: Max Schaefer <max-schaefer@github.com>
Date: Fri, 10 Jul 2020 14:12:51 +0100
Subject: [PATCH 2/3] Extract enough information to distinguish type
 definitions from alias declarations.

---
 extractor/dbscheme/tables.go                  |    8 +-
 extractor/extractor.go                        |    6 +-
 ql/src/go.dbscheme                            |    5 +-
 ql/src/go.dbscheme.stats                      | 1218 +++++++++--------
 ql/src/semmle/go/Decls.qll                    |   37 +-
 .../semmle/go/Decl/TypeSpec.expected          |    2 +
 .../library-tests/semmle/go/Decl/TypeSpec.ql  |    5 +
 ql/test/library-tests/semmle/go/Decl/main.go  |    5 +
 .../go.dbscheme                               |  434 ++++++
 .../old.dbscheme                              |  431 ++++++
 .../upgrade.properties                        |    2 +
 11 files changed, 1551 insertions(+), 602 deletions(-)
 create mode 100644 ql/test/library-tests/semmle/go/Decl/TypeSpec.expected
 create mode 100644 ql/test/library-tests/semmle/go/Decl/TypeSpec.ql
 create mode 100644 ql/test/library-tests/semmle/go/Decl/main.go
 create mode 100644 upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/go.dbscheme
 create mode 100644 upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/old.dbscheme
 create mode 100644 upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/upgrade.properties

diff --git a/extractor/dbscheme/tables.go b/extractor/dbscheme/tables.go
index a3fb0993411..56ac11411db 100644
--- a/extractor/dbscheme/tables.go
+++ b/extractor/dbscheme/tables.go
@@ -441,7 +441,13 @@ var ImportSpecType = SpecKind.NewBranch("@importspec")
 var ValueSpecType = SpecKind.NewBranch("@valuespec")
 
 // TypeSpecType is the type of type declaration specification nodes
-var TypeSpecType = SpecKind.NewBranch("@typespec")
+var TypeSpecType = NewUnionType("@typespec")
+
+// TypeDefSpecType is the type of type declaration specification nodes corresponding to type definitions
+var TypeDefSpecType = SpecKind.NewBranch("@typedefspec", TypeSpecType)
+
+// AliasSpecType is the type of type declaration specification nodes corresponding to alias declarations
+var AliasSpecType = SpecKind.NewBranch("@aliasspec", TypeSpecType)
 
 // ObjectType is the type of objects (that is, declared entities)
 var ObjectType = NewPrimaryKeyType("@object")
diff --git a/extractor/extractor.go b/extractor/extractor.go
index 4bcbe1421bf..1a69f141a52 100644
--- a/extractor/extractor.go
+++ b/extractor/extractor.go
@@ -1149,7 +1149,11 @@ func extractSpec(tw *trap.Writer, spec ast.Spec, parent trap.Label, idx int) {
 		if spec == nil {
 			return
 		}
-		kind = dbscheme.TypeSpecType.Index()
+		if spec.Assign.IsValid() {
+			kind = dbscheme.AliasSpecType.Index()
+		} else {
+			kind = dbscheme.TypeDefSpecType.Index()
+		}
 		extractExpr(tw, spec.Name, lbl, 0)
 		extractExpr(tw, spec.Type, lbl, 1)
 		extractDoc(tw, spec.Doc, lbl)
diff --git a/ql/src/go.dbscheme b/ql/src/go.dbscheme
index bcb9599aba6..bcbec1b0e44 100644
--- a/ql/src/go.dbscheme
+++ b/ql/src/go.dbscheme
@@ -317,7 +317,10 @@ case @decl.kind of
 case @spec.kind of
   0 = @importspec
 | 1 = @valuespec
-| 2 = @typespec;
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
 
 case @object.kind of
   0 = @pkgobject
diff --git a/ql/src/go.dbscheme.stats b/ql/src/go.dbscheme.stats
index 90d111d74e7..6eac39b9263 100644
--- a/ql/src/go.dbscheme.stats
+++ b/ql/src/go.dbscheme.stats
@@ -14,7 +14,7 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>537326</v>
+            <v>537408</v>
         </e>
         <e>
             <k>@file</k>
@@ -22,7 +22,7 @@
         </e>
         <e>
             <k>@folder</k>
-            <v>222</v>
+            <v>223</v>
         </e>
         <e>
             <k>@comment_group</k>
@@ -30,7 +30,7 @@
         </e>
         <e>
             <k>@slashslashcomment</k>
-            <v>24890</v>
+            <v>24891</v>
         </e>
         <e>
             <k>@slashstarcomment</k>
@@ -38,7 +38,7 @@
         </e>
         <e>
             <k>@ident</k>
-            <v>237281</v>
+            <v>237316</v>
         </e>
         <e>
             <k>@ellipsis</k>
@@ -46,7 +46,7 @@
         </e>
         <e>
             <k>@intlit</k>
-            <v>7680</v>
+            <v>7683</v>
         </e>
         <e>
             <k>@floatlit</k>
@@ -58,7 +58,7 @@
         </e>
         <e>
             <k>@stringlit</k>
-            <v>24889</v>
+            <v>24892</v>
         </e>
         <e>
             <k>@funclit</k>
@@ -66,23 +66,23 @@
         </e>
         <e>
             <k>@compositelit</k>
-            <v>2703</v>
+            <v>2704</v>
         </e>
         <e>
             <k>@parenexpr</k>
-            <v>342</v>
+            <v>343</v>
         </e>
         <e>
             <k>@selectorexpr</k>
-            <v>54345</v>
+            <v>54353</v>
         </e>
         <e>
             <k>@indexexpr</k>
-            <v>4580</v>
+            <v>4581</v>
         </e>
         <e>
             <k>@sliceexpr</k>
-            <v>835</v>
+            <v>836</v>
         </e>
         <e>
             <k>@typeassertexpr</k>
@@ -90,11 +90,11 @@
         </e>
         <e>
             <k>@callorconversionexpr</k>
-            <v>32032</v>
+            <v>32041</v>
         </e>
         <e>
             <k>@starexpr</k>
-            <v>10359</v>
+            <v>10360</v>
         </e>
         <e>
             <k>@keyvalueexpr</k>
@@ -102,7 +102,7 @@
         </e>
         <e>
             <k>@arraytypeexpr</k>
-            <v>3464</v>
+            <v>3465</v>
         </e>
         <e>
             <k>@structtypeexpr</k>
@@ -134,7 +134,7 @@
         </e>
         <e>
             <k>@addressexpr</k>
-            <v>1738</v>
+            <v>1739</v>
         </e>
         <e>
             <k>@arrowexpr</k>
@@ -158,7 +158,7 @@
         </e>
         <e>
             <k>@lssexpr</k>
-            <v>784</v>
+            <v>785</v>
         </e>
         <e>
             <k>@leqexpr</k>
@@ -166,7 +166,7 @@
         </e>
         <e>
             <k>@gtrexpr</k>
-            <v>618</v>
+            <v>619</v>
         </e>
         <e>
             <k>@geqexpr</k>
@@ -178,7 +178,7 @@
         </e>
         <e>
             <k>@subexpr</k>
-            <v>556</v>
+            <v>557</v>
         </e>
         <e>
             <k>@orexpr</k>
@@ -250,7 +250,7 @@
         </e>
         <e>
             <k>@declstmt</k>
-            <v>1452</v>
+            <v>1454</v>
         </e>
         <e>
             <k>@labeledstmt</k>
@@ -258,7 +258,7 @@
         </e>
         <e>
             <k>@exprstmt</k>
-            <v>7604</v>
+            <v>7605</v>
         </e>
         <e>
             <k>@sendstmt</k>
@@ -302,11 +302,11 @@
         </e>
         <e>
             <k>@blockstmt</k>
-            <v>19356</v>
+            <v>19358</v>
         </e>
         <e>
             <k>@ifstmt</k>
-            <v>9726</v>
+            <v>9728</v>
         </e>
         <e>
             <k>@caseclause</k>
@@ -338,11 +338,11 @@
         </e>
         <e>
             <k>@assignstmt</k>
-            <v>7477</v>
+            <v>7478</v>
         </e>
         <e>
             <k>@definestmt</k>
-            <v>9511</v>
+            <v>9514</v>
         </e>
         <e>
             <k>@addassignstmt</k>
@@ -402,7 +402,7 @@
         </e>
         <e>
             <k>@constdecl</k>
-            <v>278</v>
+            <v>280</v>
         </e>
         <e>
             <k>@typedecl</k>
@@ -422,15 +422,19 @@
         </e>
         <e>
             <k>@importspec</k>
-            <v>3466</v>
+            <v>3468</v>
         </e>
         <e>
             <k>@valuespec</k>
-            <v>3054</v>
+            <v>3056</v>
         </e>
         <e>
-            <k>@typespec</k>
-            <v>1365</v>
+            <k>@typedefspec</k>
+            <v>1349</v>
+        </e>
+        <e>
+            <k>@aliasspec</k>
+            <v>16</v>
         </e>
         <e>
             <k>@universescope</k>
@@ -438,19 +442,19 @@
         </e>
         <e>
             <k>@packagescope</k>
-            <v>342</v>
+            <v>341</v>
         </e>
         <e>
             <k>@localscope</k>
-            <v>36424</v>
+            <v>36428</v>
         </e>
         <e>
             <k>@pkgobject</k>
-            <v>3466</v>
+            <v>3468</v>
         </e>
         <e>
             <k>@decltypeobject</k>
-            <v>3526</v>
+            <v>3499</v>
         </e>
         <e>
             <k>@builtintypeobject</k>
@@ -458,7 +462,7 @@
         </e>
         <e>
             <k>@declconstobject</k>
-            <v>8262</v>
+            <v>8489</v>
         </e>
         <e>
             <k>@builtinconstobject</k>
@@ -466,11 +470,11 @@
         </e>
         <e>
             <k>@declvarobject</k>
-            <v>50424</v>
+            <v>50367</v>
         </e>
         <e>
             <k>@declfunctionobject</k>
-            <v>17441</v>
+            <v>17257</v>
         </e>
         <e>
             <k>@builtinfunctionobject</k>
@@ -582,11 +586,11 @@
         </e>
         <e>
             <k>@arraytype</k>
-            <v>284</v>
+            <v>292</v>
         </e>
         <e>
             <k>@slicetype</k>
-            <v>620</v>
+            <v>617</v>
         </e>
         <e>
             <k>@structtype</k>
@@ -598,7 +602,7 @@
         </e>
         <e>
             <k>@interfacetype</k>
-            <v>237</v>
+            <v>232</v>
         </e>
         <e>
             <k>@tupletype</k>
@@ -606,11 +610,11 @@
         </e>
         <e>
             <k>@signaturetype</k>
-            <v>7753</v>
+            <v>7772</v>
         </e>
         <e>
             <k>@maptype</k>
-            <v>417</v>
+            <v>416</v>
         </e>
         <e>
             <k>@sendchantype</k>
@@ -626,7 +630,7 @@
         </e>
         <e>
             <k>@namedtype</k>
-            <v>3488</v>
+            <v>3471</v>
         </e>
         <e>
             <k>@complexliteraltype</k>
@@ -634,7 +638,7 @@
         </e>
         <e>
             <k>@package</k>
-            <v>342</v>
+            <v>341</v>
         </e>
         <e>
             <k>@modcommentblock</k>
@@ -1358,11 +1362,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>537326</cardinality>
+            <cardinality>537408</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>537326</v>
+                    <v>537408</v>
                 </e>
                 <e>
                     <k>file</k>
@@ -1396,7 +1400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537326</v>
+                                    <v>537408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1412,7 +1416,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537326</v>
+                                    <v>537408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1428,7 +1432,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537326</v>
+                                    <v>537408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1444,7 +1448,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537326</v>
+                                    <v>537408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1460,7 +1464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537326</v>
+                                    <v>537408</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1476,17 +1480,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>30</b>
-                                    <v>41</v>
+                                    <v>40</v>
                                 </b>
                                 <b>
                                     <a>30</a>
-                                    <b>122</b>
+                                    <b>121</b>
                                     <v>40</v>
                                 </b>
                                 <b>
-                                    <a>122</a>
+                                    <a>121</a>
                                     <b>211</b>
-                                    <v>40</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>211</a>
@@ -1552,67 +1556,67 @@
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>27</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>46</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>63</b>
-                                    <v>43</v>
-                                </b>
-                                <b>
-                                    <a>63</a>
-                                    <b>79</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>79</a>
-                                    <b>94</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>95</a>
-                                    <b>121</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>121</a>
-                                    <b>154</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>154</a>
-                                    <b>191</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>193</a>
-                                    <b>250</b>
                                     <v>41</v>
                                 </b>
                                 <b>
-                                    <a>254</a>
-                                    <b>337</b>
+                                    <a>12</a>
+                                    <b>26</b>
                                     <v>40</v>
                                 </b>
                                 <b>
-                                    <a>340</a>
-                                    <b>558</b>
+                                    <a>26</a>
+                                    <b>45</b>
+                                    <v>41</v>
+                                </b>
+                                <b>
+                                    <a>45</a>
+                                    <b>61</b>
                                     <v>40</v>
                                 </b>
                                 <b>
-                                    <a>571</a>
+                                    <a>61</a>
+                                    <b>75</b>
+                                    <v>41</v>
+                                </b>
+                                <b>
+                                    <a>75</a>
+                                    <b>93</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>93</a>
+                                    <b>120</b>
+                                    <v>41</v>
+                                </b>
+                                <b>
+                                    <a>120</a>
+                                    <b>153</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>153</a>
+                                    <b>190</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>190</a>
+                                    <b>247</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>249</a>
+                                    <b>325</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>336</a>
+                                    <b>544</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>554</a>
                                     <b>10233</b>
-                                    <v>35</v>
+                                    <v>37</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1632,13 +1636,13 @@
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>34</b>
-                                    <v>40</v>
+                                    <b>35</b>
+                                    <v>41</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
+                                    <a>35</a>
                                     <b>46</b>
-                                    <v>45</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>46</a>
@@ -1704,12 +1708,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>41</v>
+                                    <v>40</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>32</b>
-                                    <v>43</v>
+                                    <v>44</v>
                                 </b>
                                 <b>
                                     <a>32</a>
@@ -1780,7 +1784,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>18</b>
-                                    <v>41</v>
+                                    <v>40</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -1790,7 +1794,7 @@
                                 <b>
                                     <a>46</a>
                                     <b>59</b>
-                                    <v>42</v>
+                                    <v>43</v>
                                 </b>
                                 <b>
                                     <a>59</a>
@@ -2095,7 +2099,7 @@
                                 </b>
                                 <b>
                                     <a>773</a>
-                                    <b>1789</b>
+                                    <b>1790</b>
                                     <v>16</v>
                                 </b>
                                 <b>
@@ -2105,7 +2109,7 @@
                                 </b>
                                 <b>
                                     <a>4029</a>
-                                    <b>8598</b>
+                                    <b>8601</b>
                                     <v>16</v>
                                 </b>
                                 <b>
@@ -2114,8 +2118,8 @@
                                     <v>16</v>
                                 </b>
                                 <b>
-                                    <a>27989</a>
-                                    <b>55545</b>
+                                    <a>27991</a>
+                                    <b>55558</b>
                                     <v>3</v>
                                 </b>
                             </bs>
@@ -2165,7 +2169,7 @@
                                     <v>16</v>
                                 </b>
                                 <b>
-                                    <a>203</a>
+                                    <a>204</a>
                                     <b>300</b>
                                     <v>16</v>
                                 </b>
@@ -2180,8 +2184,8 @@
                                     <v>16</v>
                                 </b>
                                 <b>
-                                    <a>431</a>
-                                    <b>458</b>
+                                    <a>432</a>
+                                    <b>459</b>
                                     <v>16</v>
                                 </b>
                                 <b>
@@ -2650,27 +2654,27 @@
                                 </b>
                                 <b>
                                     <a>287</a>
-                                    <b>913</b>
+                                    <b>915</b>
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>1001</a>
+                                    <a>1002</a>
                                     <b>2526</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>2555</a>
-                                    <b>5281</b>
+                                    <b>5288</b>
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>5733</a>
-                                    <b>10000</b>
+                                    <a>5734</a>
+                                    <b>10001</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>10080</a>
-                                    <b>20357</b>
+                                    <b>20361</b>
                                     <v>19</v>
                                 </b>
                             </bs>
@@ -2715,24 +2719,24 @@
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>242</a>
+                                    <a>243</a>
                                     <b>370</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>371</a>
-                                    <b>429</b>
+                                    <b>430</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>430</a>
                                     <b>453</b>
-                                    <v>22</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>453</a>
                                     <b>524</b>
-                                    <v>19</v>
+                                    <v>20</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2772,7 +2776,7 @@
                                 </b>
                                 <b>
                                     <a>152</a>
-                                    <b>413</b>
+                                    <b>414</b>
                                     <v>20</v>
                                 </b>
                                 <b>
@@ -2899,7 +2903,7 @@
                                 </b>
                                 <b>
                                     <a>151</a>
-                                    <b>406</b>
+                                    <b>407</b>
                                     <v>20</v>
                                 </b>
                                 <b>
@@ -3008,12 +3012,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>184</v>
+                                    <v>183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>73</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3039,12 +3043,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>188</v>
+                                    <v>187</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81</v>
+                                    <v>82</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3070,12 +3074,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189</v>
+                                    <v>188</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>78</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3101,12 +3105,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>253</v>
+                                    <v>252</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64</v>
+                                    <v>65</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3132,12 +3136,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>257</v>
+                                    <v>256</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>66</v>
+                                    <v>67</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3158,12 +3162,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>260</v>
+                                    <v>259</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62</v>
+                                    <v>63</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3214,12 +3218,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>13</v>
+                                    <v>12</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>31</b>
-                                    <v>11</v>
+                                    <v>12</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3259,13 +3263,13 @@
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>9</b>
-                                    <v>11</v>
+                                    <b>10</b>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>10</a>
                                     <b>25</b>
-                                    <v>12</v>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3704,15 +3708,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>222</cardinality>
+            <cardinality>223</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>222</v>
+                    <v>223</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>222</v>
+                    <v>223</v>
                 </e>
                 <e>
                     <k>simple</k>
@@ -3730,7 +3734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>222</v>
+                                    <v>223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3746,7 +3750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>222</v>
+                                    <v>223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3762,7 +3766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>222</v>
+                                    <v>223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3778,7 +3782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>222</v>
+                                    <v>223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3794,12 +3798,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>164</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18</v>
+                                    <v>19</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3820,12 +3824,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>164</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18</v>
+                                    <v>19</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3840,15 +3844,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>744</cardinality>
+            <cardinality>745</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>222</v>
+                    <v>223</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>744</v>
+                    <v>745</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3862,7 +3866,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>126</v>
+                                    <v>127</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -3908,7 +3912,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>744</v>
+                                    <v>745</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3918,15 +3922,15 @@
         </relation>
         <relation>
             <name>has_location</name>
-            <cardinality>599313</cardinality>
+            <cardinality>599403</cardinality>
             <columnsizes>
                 <e>
                     <k>locatable</k>
-                    <v>599313</v>
+                    <v>599403</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>537326</v>
+                    <v>537408</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3940,7 +3944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599313</v>
+                                    <v>599403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3956,12 +3960,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475654</v>
+                                    <v>475728</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61628</v>
+                                    <v>61636</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4272,11 +4276,11 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>25736</cardinality>
+            <cardinality>25737</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25736</v>
+                    <v>25737</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -4306,7 +4310,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25736</v>
+                                    <v>25737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4322,7 +4326,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25736</v>
+                                    <v>25737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4338,7 +4342,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25736</v>
+                                    <v>25737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4354,7 +4358,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25736</v>
+                                    <v>25737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4373,8 +4377,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>24890</a>
-                                    <b>24891</b>
+                                    <a>24891</a>
+                                    <b>24892</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -4454,12 +4458,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7838</v>
+                                    <v>7837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1788</v>
+                                    <v>1789</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4511,12 +4515,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7838</v>
+                                    <v>7837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1788</v>
+                                    <v>1789</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4547,12 +4551,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7838</v>
+                                    <v>7837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1818</v>
+                                    <v>1819</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4918,11 +4922,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>413969</cardinality>
+            <cardinality>414037</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>413969</v>
+                    <v>414037</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -4930,7 +4934,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>219286</v>
+                    <v>219324</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -4948,7 +4952,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>413969</v>
+                                    <v>414037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4964,7 +4968,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>413969</v>
+                                    <v>414037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4980,7 +4984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>413969</v>
+                                    <v>414037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5015,12 +5019,12 @@
                                 </b>
                                 <b>
                                     <a>248</a>
-                                    <b>343</b>
+                                    <b>344</b>
                                     <v>4</v>
                                 </b>
                                 <b>
                                     <a>509</a>
-                                    <b>619</b>
+                                    <b>620</b>
                                     <v>4</v>
                                 </b>
                                 <b>
@@ -5035,22 +5039,22 @@
                                 </b>
                                 <b>
                                     <a>1272</a>
-                                    <b>2704</b>
+                                    <b>2705</b>
                                     <v>4</v>
                                 </b>
                                 <b>
                                     <a>3244</a>
-                                    <b>4581</b>
+                                    <b>4582</b>
                                     <v>4</v>
                                 </b>
                                 <b>
                                     <a>5616</a>
-                                    <b>10360</b>
+                                    <b>10361</b>
                                     <v>4</v>
                                 </b>
                                 <b>
-                                    <a>24889</a>
-                                    <b>237282</b>
+                                    <a>24892</a>
+                                    <b>237317</b>
                                     <v>4</v>
                                 </b>
                             </bs>
@@ -5086,7 +5090,7 @@
                                 </b>
                                 <b>
                                     <a>233</a>
-                                    <b>323</b>
+                                    <b>324</b>
                                     <v>4</v>
                                 </b>
                                 <b>
@@ -5096,7 +5100,7 @@
                                 </b>
                                 <b>
                                     <a>676</a>
-                                    <b>789</b>
+                                    <b>790</b>
                                     <v>4</v>
                                 </b>
                                 <b>
@@ -5110,18 +5114,18 @@
                                     <v>4</v>
                                 </b>
                                 <b>
-                                    <a>2581</a>
+                                    <a>2582</a>
                                     <b>3985</b>
                                     <v>4</v>
                                 </b>
                                 <b>
-                                    <a>4251</a>
-                                    <b>10114</b>
+                                    <a>4252</a>
+                                    <b>10115</b>
                                     <v>4</v>
                                 </b>
                                 <b>
-                                    <a>14083</a>
-                                    <b>154721</b>
+                                    <a>14086</a>
+                                    <b>154744</b>
                                     <v>4</v>
                                 </b>
                             </bs>
@@ -5199,17 +5203,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65795</v>
+                                    <v>65804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133306</v>
+                                    <v>133334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>17888</v>
+                                    <v>17889</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5230,17 +5234,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137240</v>
+                                    <v>137263</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>75799</v>
+                                    <v>75813</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>6247</v>
+                                    <v>6248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5256,17 +5260,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65795</v>
+                                    <v>65804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133306</v>
+                                    <v>133334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>17888</v>
+                                    <v>17889</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5301,7 +5305,7 @@
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>179978</b>
+                                    <b>180006</b>
                                     <v>288</v>
                                 </b>
                             </bs>
@@ -5358,7 +5362,7 @@
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>179978</b>
+                                    <b>180006</b>
                                     <v>288</v>
                                 </b>
                             </bs>
@@ -5369,19 +5373,19 @@
         </relation>
         <relation>
             <name>literals</name>
-            <cardinality>270715</cardinality>
+            <cardinality>270756</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>270715</v>
+                    <v>270756</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>25793</v>
+                    <v>25795</v>
                 </e>
                 <e>
                     <k>raw</k>
-                    <v>27591</v>
+                    <v>27594</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5395,7 +5399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270715</v>
+                                    <v>270756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5411,7 +5415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270715</v>
+                                    <v>270756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5432,22 +5436,22 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3292</v>
+                                    <v>3291</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1781</v>
+                                    <v>1783</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1934</v>
+                                    <v>1931</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>1964</v>
+                                    <v>1968</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -5473,12 +5477,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24050</v>
+                                    <v>24051</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1743</v>
+                                    <v>1744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5494,32 +5498,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16039</v>
+                                    <v>16038</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3519</v>
+                                    <v>3521</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1868</v>
+                                    <v>1869</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>2554</v>
+                                    <v>2553</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>2128</v>
+                                    <v>2129</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>6833</b>
-                                    <v>1483</v>
+                                    <v>1484</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5535,7 +5539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27591</v>
+                                    <v>27594</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5545,19 +5549,19 @@
         </relation>
         <relation>
             <name>constvalues</name>
-            <cardinality>43919</cardinality>
+            <cardinality>43931</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>43919</v>
+                    <v>43931</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>16894</v>
+                    <v>16896</v>
                 </e>
                 <e>
                     <k>exact</k>
-                    <v>16895</v>
+                    <v>16897</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5571,7 +5575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43919</v>
+                                    <v>43931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5587,7 +5591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43919</v>
+                                    <v>43931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5603,7 +5607,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14930</v>
+                                    <v>14932</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5629,7 +5633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16893</v>
+                                    <v>16895</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5650,7 +5654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14931</v>
+                                    <v>14933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5676,7 +5680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16895</v>
+                                    <v>16897</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5922,11 +5926,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>73979</cardinality>
+            <cardinality>73990</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73979</v>
+                    <v>73990</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -5934,7 +5938,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41539</v>
+                    <v>41543</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -5952,7 +5956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73979</v>
+                                    <v>73990</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5968,7 +5972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73979</v>
+                                    <v>73990</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5984,7 +5988,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73979</v>
+                                    <v>73990</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6044,17 +6048,17 @@
                                 </b>
                                 <b>
                                     <a>3476</a>
-                                    <b>7605</b>
+                                    <b>7606</b>
                                     <v>3</v>
                                 </b>
                                 <b>
                                     <a>9225</a>
-                                    <b>9727</b>
+                                    <b>9729</b>
                                     <v>3</v>
                                 </b>
                                 <b>
-                                    <a>19356</a>
-                                    <b>19357</b>
+                                    <a>19358</a>
+                                    <b>19359</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -6110,22 +6114,22 @@
                                 </b>
                                 <b>
                                     <a>606</a>
-                                    <b>1153</b>
+                                    <b>1154</b>
                                     <v>3</v>
                                 </b>
                                 <b>
                                     <a>1719</a>
-                                    <b>5671</b>
+                                    <b>5672</b>
                                     <v>3</v>
                                 </b>
                                 <b>
-                                    <a>5911</a>
+                                    <a>5912</a>
                                     <b>9226</b>
                                     <v>3</v>
                                 </b>
                                 <b>
-                                    <a>18818</a>
-                                    <b>18819</b>
+                                    <a>18820</a>
+                                    <b>18821</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -6213,7 +6217,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29359</v>
+                                    <v>29362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6228,7 +6232,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>82</b>
-                                    <v>2393</v>
+                                    <v>2394</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6244,7 +6248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31415</v>
+                                    <v>31418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6254,7 +6258,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3596</v>
+                                    <v>3597</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -6275,7 +6279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29359</v>
+                                    <v>29362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6290,7 +6294,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>82</b>
-                                    <v>2393</v>
+                                    <v>2394</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6345,12 +6349,12 @@
                                 </b>
                                 <b>
                                     <a>314</a>
-                                    <b>1278</b>
+                                    <b>1279</b>
                                     <v>7</v>
                                 </b>
                                 <b>
-                                    <a>1719</a>
-                                    <b>24877</b>
+                                    <a>1720</a>
+                                    <b>24879</b>
                                     <v>6</v>
                                 </b>
                             </bs>
@@ -6467,12 +6471,12 @@
                                 </b>
                                 <b>
                                     <a>314</a>
-                                    <b>1278</b>
+                                    <b>1279</b>
                                     <v>7</v>
                                 </b>
                                 <b>
-                                    <a>1719</a>
-                                    <b>24877</b>
+                                    <a>1720</a>
+                                    <b>24879</b>
                                     <v>6</v>
                                 </b>
                             </bs>
@@ -6483,11 +6487,11 @@
         </relation>
         <relation>
             <name>decls</name>
-            <cardinality>8688</cardinality>
+            <cardinality>8690</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8688</v>
+                    <v>8690</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -6495,7 +6499,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1949</v>
+                    <v>1951</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -6513,7 +6517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8688</v>
+                                    <v>8690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6529,7 +6533,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8688</v>
+                                    <v>8690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6545,7 +6549,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8688</v>
+                                    <v>8690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6559,8 +6563,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>278</a>
-                                    <b>279</b>
+                                    <a>280</a>
+                                    <b>281</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -6595,8 +6599,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>194</a>
-                                    <b>195</b>
+                                    <a>196</a>
+                                    <b>197</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -6669,7 +6673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1458</v>
+                                    <v>1460</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6705,7 +6709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1461</v>
+                                    <v>1463</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6741,7 +6745,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1458</v>
+                                    <v>1460</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6826,7 +6830,7 @@
                                 </b>
                                 <b>
                                     <a>323</a>
-                                    <b>1950</b>
+                                    <b>1952</b>
                                     <v>7</v>
                                 </b>
                             </bs>
@@ -6928,7 +6932,7 @@
                                 </b>
                                 <b>
                                     <a>323</a>
-                                    <b>1950</b>
+                                    <b>1952</b>
                                     <v>7</v>
                                 </b>
                             </bs>
@@ -6939,19 +6943,19 @@
         </relation>
         <relation>
             <name>specs</name>
-            <cardinality>7885</cardinality>
+            <cardinality>7889</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7885</v>
+                    <v>7889</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3</v>
+                    <v>4</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>3875</v>
+                    <v>3877</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -6969,7 +6973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7885</v>
+                                    <v>7889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6985,7 +6989,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7885</v>
+                                    <v>7889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7001,7 +7005,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7885</v>
+                                    <v>7889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7015,18 +7019,23 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1365</a>
-                                    <b>1366</b>
+                                    <a>16</a>
+                                    <b>17</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3054</a>
-                                    <b>3055</b>
+                                    <a>1349</a>
+                                    <b>1350</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3466</a>
-                                    <b>3467</b>
+                                    <a>3056</a>
+                                    <b>3057</b>
+                                    <v>1</v>
+                                </b>
+                                <b>
+                                    <a>3468</a>
+                                    <b>3469</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -7040,19 +7049,24 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>1</v>
+                                </b>
                                 <b>
                                     <a>479</a>
                                     <b>480</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>1349</a>
-                                    <b>1350</b>
+                                    <a>1333</a>
+                                    <b>1334</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>2047</a>
-                                    <b>2048</b>
+                                    <a>2049</a>
+                                    <b>2050</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -7066,6 +7080,11 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
@@ -7095,12 +7114,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3205</v>
+                                    <v>3206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>342</v>
+                                    <v>343</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7126,7 +7145,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3875</v>
+                                    <v>3877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7142,12 +7161,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3205</v>
+                                    <v>3206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>342</v>
+                                    <v>343</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7197,7 +7216,7 @@
                                 </b>
                                 <b>
                                     <a>188</a>
-                                    <b>3876</b>
+                                    <b>3878</b>
                                     <v>9</v>
                                 </b>
                             </bs>
@@ -7224,7 +7243,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14</v>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7264,7 +7288,7 @@
                                 </b>
                                 <b>
                                     <a>188</a>
-                                    <b>3876</b>
+                                    <b>3878</b>
                                     <v>9</v>
                                 </b>
                             </bs>
@@ -7275,11 +7299,11 @@
         </relation>
         <relation>
             <name>scopes</name>
-            <cardinality>36767</cardinality>
+            <cardinality>36770</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36767</v>
+                    <v>36770</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7297,7 +7321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36767</v>
+                                    <v>36770</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7316,13 +7340,13 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>342</a>
-                                    <b>343</b>
+                                    <a>341</a>
+                                    <b>342</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>36424</a>
-                                    <b>36425</b>
+                                    <a>36428</a>
+                                    <b>36429</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -7333,15 +7357,15 @@
         </relation>
         <relation>
             <name>scopenesting</name>
-            <cardinality>36766</cardinality>
+            <cardinality>36769</cardinality>
             <columnsizes>
                 <e>
                     <k>inner</k>
-                    <v>36766</v>
+                    <v>36769</v>
                 </e>
                 <e>
                     <k>outer</k>
-                    <v>21710</v>
+                    <v>21713</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7355,7 +7379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36766</v>
+                                    <v>36769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7371,12 +7395,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16962</v>
+                                    <v>16964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2473</v>
+                                    <v>2474</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7385,7 +7409,7 @@
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>343</b>
+                                    <b>342</b>
                                     <v>516</v>
                                 </b>
                             </bs>
@@ -7396,15 +7420,15 @@
         </relation>
         <relation>
             <name>scopenodes</name>
-            <cardinality>36424</cardinality>
+            <cardinality>36428</cardinality>
             <columnsizes>
                 <e>
                     <k>node</k>
-                    <v>36424</v>
+                    <v>36428</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>36424</v>
+                    <v>36428</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7418,7 +7442,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36424</v>
+                                    <v>36428</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7434,7 +7458,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36424</v>
+                                    <v>36428</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7444,11 +7468,11 @@
         </relation>
         <relation>
             <name>objects</name>
-            <cardinality>83210</cardinality>
+            <cardinality>83171</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>83210</v>
+                    <v>83171</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7456,7 +7480,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>29409</v>
+                    <v>29534</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7470,7 +7494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83210</v>
+                                    <v>83171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7486,7 +7510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83210</v>
+                                    <v>83171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7520,28 +7544,28 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3466</a>
-                                    <b>3467</b>
+                                    <a>3468</a>
+                                    <b>3469</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3526</a>
-                                    <b>3527</b>
+                                    <a>3499</a>
+                                    <b>3500</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>8262</a>
-                                    <b>8263</b>
+                                    <a>8489</a>
+                                    <b>8490</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>17441</a>
-                                    <b>17442</b>
+                                    <a>17257</a>
+                                    <b>17258</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>50424</a>
-                                    <b>50425</b>
+                                    <a>50367</a>
+                                    <b>50368</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -7581,23 +7605,23 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>2937</a>
-                                    <b>2938</b>
+                                    <a>2924</a>
+                                    <b>2925</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>7822</a>
-                                    <b>7823</b>
+                                    <a>8048</a>
+                                    <b>8049</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>9789</a>
-                                    <b>9790</b>
+                                    <a>9833</a>
+                                    <b>9834</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>10708</a>
-                                    <b>10709</b>
+                                    <a>10579</a>
+                                    <b>10580</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -7614,22 +7638,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24165</v>
+                                    <v>24323</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2593</v>
+                                    <v>2561</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>17</b>
-                                    <v>2228</v>
+                                    <v>2229</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>2198</b>
-                                    <v>423</v>
+                                    <b>2197</b>
+                                    <v>421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7645,12 +7669,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27682</v>
+                                    <v>27802</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1727</v>
+                                    <v>1732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7660,15 +7684,15 @@
         </relation>
         <relation>
             <name>objectscopes</name>
-            <cardinality>53810</cardinality>
+            <cardinality>53877</cardinality>
             <columnsizes>
                 <e>
                     <k>object</k>
-                    <v>53810</v>
+                    <v>53877</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>13943</v>
+                    <v>13942</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7682,7 +7706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53810</v>
+                                    <v>53877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7698,7 +7722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7114</v>
+                                    <v>7112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7708,7 +7732,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1275</v>
+                                    <v>1276</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -7722,7 +7746,7 @@
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>2484</b>
+                                    <b>2520</b>
                                     <v>266</v>
                                 </b>
                             </bs>
@@ -7733,15 +7757,15 @@
         </relation>
         <relation>
             <name>objecttypes</name>
-            <cardinality>83208</cardinality>
+            <cardinality>83169</cardinality>
             <columnsizes>
                 <e>
                     <k>object</k>
-                    <v>83208</v>
+                    <v>83169</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>13063</v>
+                    <v>13062</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7755,7 +7779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83208</v>
+                                    <v>83169</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7771,32 +7795,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7609</v>
+                                    <v>7630</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2069</v>
+                                    <v>2070</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>872</v>
+                                    <v>862</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1156</v>
+                                    <v>1150</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>24</b>
-                                    <v>983</v>
+                                    <b>25</b>
+                                    <v>993</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>4235</b>
-                                    <v>374</v>
+                                    <a>25</a>
+                                    <b>4231</b>
+                                    <v>357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7806,15 +7830,15 @@
         </relation>
         <relation>
             <name>methodreceivers</name>
-            <cardinality>9670</cardinality>
+            <cardinality>9624</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>9670</v>
+                    <v>9624</v>
                 </e>
                 <e>
                     <k>receiver</k>
-                    <v>9670</v>
+                    <v>9624</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7828,7 +7852,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9670</v>
+                                    <v>9624</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7844,7 +7868,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9670</v>
+                                    <v>9624</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7854,11 +7878,11 @@
         </relation>
         <relation>
             <name>fieldstructs</name>
-            <cardinality>10605</cardinality>
+            <cardinality>10591</cardinality>
             <columnsizes>
                 <e>
                     <k>field</k>
-                    <v>10605</v>
+                    <v>10591</v>
                 </e>
                 <e>
                     <k>struct</k>
@@ -7876,7 +7900,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10605</v>
+                                    <v>10591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7892,37 +7916,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>251</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>660</v>
+                                    <v>664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>450</v>
+                                    <v>446</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>284</v>
+                                    <v>286</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>191</v>
+                                    <v>192</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>200</v>
+                                    <v>203</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>194</v>
+                                    <v>190</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -7937,15 +7961,15 @@
         </relation>
         <relation>
             <name>methodhosts</name>
-            <cardinality>801</cardinality>
+            <cardinality>792</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>681</v>
+                    <v>672</v>
                 </e>
                 <e>
                     <k>host</k>
-                    <v>246</v>
+                    <v>241</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7959,7 +7983,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>619</v>
+                                    <v>610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7985,7 +8009,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99</v>
+                                    <v>95</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8005,7 +8029,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>16</v>
+                                    <v>15</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -8025,15 +8049,15 @@
         </relation>
         <relation>
             <name>defs</name>
-            <cardinality>40698</cardinality>
+            <cardinality>40703</cardinality>
             <columnsizes>
                 <e>
                     <k>ident</k>
-                    <v>40698</v>
+                    <v>40703</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>40485</v>
+                    <v>40490</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8047,7 +8071,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40698</v>
+                                    <v>40703</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8063,7 +8087,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40378</v>
+                                    <v>40383</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8078,15 +8102,15 @@
         </relation>
         <relation>
             <name>uses</name>
-            <cardinality>195872</cardinality>
+            <cardinality>195902</cardinality>
             <columnsizes>
                 <e>
                     <k>ident</k>
-                    <v>195872</v>
+                    <v>195902</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>41610</v>
+                    <v>41616</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8100,7 +8124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195872</v>
+                                    <v>195902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8116,32 +8140,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15495</v>
+                                    <v>15493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9723</v>
+                                    <v>9727</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5053</v>
+                                    <v>5056</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2975</v>
+                                    <v>2974</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>3202</v>
+                                    <v>3203</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>14</b>
-                                    <v>3335</v>
+                                    <v>3336</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -8156,11 +8180,11 @@
         </relation>
         <relation>
             <name>types</name>
-            <cardinality>17636</cardinality>
+            <cardinality>17637</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>17636</v>
+                    <v>17637</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8178,7 +8202,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17636</v>
+                                    <v>17637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8202,8 +8226,8 @@
                                     <v>3</v>
                                 </b>
                                 <b>
-                                    <a>237</a>
-                                    <b>418</b>
+                                    <a>232</a>
+                                    <b>417</b>
                                     <v>3</v>
                                 </b>
                                 <b>
@@ -8213,7 +8237,7 @@
                                 </b>
                                 <b>
                                     <a>2339</a>
-                                    <b>7754</b>
+                                    <b>7773</b>
                                     <v>3</v>
                                 </b>
                             </bs>
@@ -8224,11 +8248,11 @@
         </relation>
         <relation>
             <name>type_of</name>
-            <cardinality>397900</cardinality>
+            <cardinality>397965</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>397900</v>
+                    <v>397965</v>
                 </e>
                 <e>
                     <k>tp</k>
@@ -8246,7 +8270,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>397900</v>
+                                    <v>397965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8262,12 +8286,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2011</v>
+                                    <v>2010</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>961</v>
+                                    <v>962</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8282,7 +8306,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>784</v>
+                                    <v>783</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -8292,7 +8316,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>736</v>
+                                    <v>737</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -8311,7 +8335,7 @@
                                 </b>
                                 <b>
                                     <a>150</a>
-                                    <b>46948</b>
+                                    <b>46949</b>
                                     <v>303</v>
                                 </b>
                             </bs>
@@ -8322,15 +8346,15 @@
         </relation>
         <relation>
             <name>typename</name>
-            <cardinality>3488</cardinality>
+            <cardinality>3471</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>3488</v>
+                    <v>3471</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2909</v>
+                    <v>2903</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8344,7 +8368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3488</v>
+                                    <v>3471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8364,13 +8388,13 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>212</v>
+                                    <b>4</b>
+                                    <v>265</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
+                                    <a>4</a>
                                     <b>16</b>
-                                    <v>113</v>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8380,11 +8404,11 @@
         </relation>
         <relation>
             <name>key_type</name>
-            <cardinality>417</cardinality>
+            <cardinality>416</cardinality>
             <columnsizes>
                 <e>
                     <k>map</k>
-                    <v>417</v>
+                    <v>416</v>
                 </e>
                 <e>
                     <k>tp</k>
@@ -8402,7 +8426,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>417</v>
+                                    <v>416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8448,15 +8472,15 @@
         </relation>
         <relation>
             <name>element_type</name>
-            <cardinality>1374</cardinality>
+            <cardinality>1378</cardinality>
             <columnsizes>
                 <e>
                     <k>container</k>
-                    <v>1374</v>
+                    <v>1378</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>889</v>
+                    <v>892</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8470,7 +8494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1374</v>
+                                    <v>1378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8486,7 +8510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>753</v>
+                                    <v>756</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8554,15 +8578,15 @@
         </relation>
         <relation>
             <name>underlying_type</name>
-            <cardinality>3488</cardinality>
+            <cardinality>3471</cardinality>
             <columnsizes>
                 <e>
                     <k>named</k>
-                    <v>3488</v>
+                    <v>3471</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>2681</v>
+                    <v>2677</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8576,7 +8600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3488</v>
+                                    <v>3471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8592,12 +8616,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2508</v>
+                                    <v>2505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>150</b>
-                                    <v>173</v>
+                                    <b>148</b>
+                                    <v>172</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8607,11 +8631,11 @@
         </relation>
         <relation>
             <name>component_types</name>
-            <cardinality>35096</cardinality>
+            <cardinality>35194</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>10884</v>
+                    <v>10898</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -8619,11 +8643,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>5292</v>
+                    <v>5339</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>4184</v>
+                    <v>4170</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8637,7 +8661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1166</v>
+                                    <v>1157</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8647,27 +8671,27 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2795</v>
+                                    <v>2791</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1374</v>
+                                    <v>1377</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>740</v>
+                                    <v>759</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>824</v>
+                                    <v>828</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>62</b>
-                                    <v>105</v>
+                                    <v>106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8683,22 +8707,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8671</v>
+                                    <v>8684</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>708</v>
+                                    <v>712</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>977</v>
+                                    <v>975</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>61</b>
-                                    <v>528</v>
+                                    <v>527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8714,32 +8738,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2237</v>
+                                    <v>2232</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4333</v>
+                                    <v>4348</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2373</v>
+                                    <v>2379</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1065</v>
+                                    <v>1068</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>12</b>
-                                    <v>819</v>
+                                    <b>13</b>
+                                    <v>822</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
+                                    <a>13</a>
                                     <b>52</b>
-                                    <v>57</v>
+                                    <v>49</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8769,48 +8793,48 @@
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>12</b>
+                                    <b>11</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>18</b>
+                                    <a>11</a>
+                                    <b>17</b>
+                                    <v>5</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>23</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>26</b>
+                                    <a>24</a>
+                                    <b>42</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>47</b>
+                                    <a>47</a>
+                                    <b>70</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>82</b>
+                                    <a>81</a>
+                                    <b>152</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>90</a>
-                                    <b>185</b>
+                                    <a>186</a>
+                                    <b>490</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>227</a>
-                                    <b>793</b>
+                                    <a>794</a>
+                                    <b>5839</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>1448</a>
-                                    <b>6238</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>9957</a>
-                                    <b>9958</b>
-                                    <v>1</v>
+                                    <a>6255</a>
+                                    <b>9984</b>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8839,39 +8863,39 @@
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>16</b>
+                                    <a>9</a>
+                                    <b>15</b>
                                     <v>5</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>23</b>
-                                    <v>6</v>
+                                    <a>16</a>
+                                    <b>22</b>
+                                    <v>5</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>35</b>
+                                    <a>22</a>
+                                    <b>33</b>
                                     <v>6</v>
                                 </b>
                                 <b>
                                     <a>36</a>
-                                    <b>67</b>
+                                    <b>59</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>76</a>
-                                    <b>142</b>
+                                    <a>66</a>
+                                    <b>112</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>167</a>
-                                    <b>449</b>
+                                    <a>143</a>
+                                    <b>355</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>595</a>
-                                    <b>1217</b>
-                                    <v>5</v>
+                                    <a>455</a>
+                                    <b>1228</b>
+                                    <v>6</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8901,49 +8925,49 @@
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>9</b>
+                                    <b>8</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
+                                    <a>9</a>
                                     <b>14</b>
-                                    <v>4</v>
+                                    <v>6</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>21</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>32</b>
+                                    <a>18</a>
+                                    <b>28</b>
                                     <v>6</v>
                                 </b>
                                 <b>
                                     <a>32</a>
-                                    <b>48</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>51</a>
-                                    <b>102</b>
+                                    <b>46</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>116</a>
-                                    <b>294</b>
+                                    <a>47</a>
+                                    <b>84</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>453</a>
-                                    <b>2093</b>
+                                    <a>103</a>
+                                    <b>216</b>
                                     <v>6</v>
                                 </b>
+                                <b>
+                                    <a>297</a>
+                                    <b>1836</b>
+                                    <v>6</v>
+                                </b>
+                                <b>
+                                    <a>2095</a>
+                                    <b>2096</b>
+                                    <v>1</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -8958,22 +8982,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3693</v>
+                                    <v>3760</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>864</v>
+                                    <v>847</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>414</v>
+                                    <v>406</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>8652</b>
-                                    <v>321</v>
+                                    <b>8671</b>
+                                    <v>326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8989,22 +9013,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4093</v>
+                                    <v>4133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>699</v>
+                                    <v>704</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>422</v>
+                                    <v>423</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>28</b>
-                                    <v>78</v>
+                                    <v>79</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9020,22 +9044,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4385</v>
+                                    <v>4427</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>496</v>
+                                    <v>498</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>397</v>
+                                    <v>401</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>2944</b>
-                                    <v>14</v>
+                                    <b>2936</b>
+                                    <v>13</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9056,27 +9080,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>815</v>
+                                    <v>795</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>392</v>
+                                    <v>400</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>376</v>
+                                    <v>374</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>329</v>
+                                    <v>330</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2102</b>
-                                    <v>280</v>
+                                    <b>2115</b>
+                                    <v>279</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9092,27 +9116,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2048</v>
+                                    <v>2042</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>846</v>
+                                    <v>836</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>559</v>
+                                    <v>561</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>346</v>
+                                    <v>347</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>325</v>
+                                    <v>324</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -9133,12 +9157,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2823</v>
+                                    <v>2808</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>840</v>
+                                    <v>841</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -9147,7 +9171,7 @@
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>677</b>
+                                    <b>679</b>
                                     <v>188</v>
                                 </b>
                             </bs>
@@ -9158,15 +9182,15 @@
         </relation>
         <relation>
             <name>array_length</name>
-            <cardinality>284</cardinality>
+            <cardinality>292</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>284</v>
+                    <v>292</v>
                 </e>
                 <e>
                     <k>len</k>
-                    <v>99</v>
+                    <v>103</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9180,7 +9204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>284</v>
+                                    <v>292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9196,32 +9220,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59</v>
+                                    <v>62</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14</v>
+                                    <v>16</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
+                                    <b>5</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>7</b>
+                                    <a>5</a>
+                                    <b>8</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>15</b>
+                                    <a>10</a>
+                                    <b>16</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>26</b>
-                                    <v>2</v>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>1</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9231,15 +9255,15 @@
         </relation>
         <relation>
             <name>type_objects</name>
-            <cardinality>3488</cardinality>
+            <cardinality>3471</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>3488</v>
+                    <v>3471</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>3488</v>
+                    <v>3471</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9253,7 +9277,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3488</v>
+                                    <v>3471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9269,7 +9293,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3488</v>
+                                    <v>3471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9279,23 +9303,23 @@
         </relation>
         <relation>
             <name>packages</name>
-            <cardinality>342</cardinality>
+            <cardinality>341</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>342</v>
+                    <v>341</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>277</v>
+                    <v>276</v>
                 </e>
                 <e>
                     <k>path</k>
-                    <v>342</v>
+                    <v>341</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>342</v>
+                    <v>341</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9309,7 +9333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9325,7 +9349,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9341,7 +9365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9357,7 +9381,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>251</v>
+                                    <v>250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9383,7 +9407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>251</v>
+                                    <v>250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9409,7 +9433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>251</v>
+                                    <v>250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9435,7 +9459,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9451,7 +9475,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9467,7 +9491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9483,7 +9507,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9499,7 +9523,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9515,7 +9539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>342</v>
+                                    <v>341</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/ql/src/semmle/go/Decls.qll b/ql/src/semmle/go/Decls.qll
index 031a287f757..205c666b210 100644
--- a/ql/src/semmle/go/Decls.qll
+++ b/ql/src/semmle/go/Decls.qll
@@ -371,7 +371,16 @@ class ValueSpec extends @valuespec, Spec {
 }
 
 /**
- * A type declaration specifier.
+ * A type declaration specifier, which is either a type definition or an alias declaration.
+ *
+ * Examples:
+ *
+ * ```
+ * type (
+ *   status int
+ *   intlist = []int
+ * )
+ * ```
  */
 class TypeSpec extends @typespec, Spec {
   /** Gets the identifier denoting the name of the declared type. */
@@ -380,7 +389,9 @@ class TypeSpec extends @typespec, Spec {
   /** Gets the name of the declared type. */
   string getName() { result = getNameExpr().getName() }
 
-  /** Gets the expression denoting the underlying type to which the newly declared type is aliased. */
+  /**
+   * Gets the expression denoting the underlying type to which the newly declared type is bound.
+   */
   Expr getTypeExpr() { result = getChildExpr(1) }
 
   override string toString() { result = "type declaration specifier" }
@@ -388,6 +399,28 @@ class TypeSpec extends @typespec, Spec {
   override string getAPrimaryQlClass() { result = "TypeSpec" }
 }
 
+/**
+ * An alias declaration specifier.
+ *
+ * Examples:
+ *
+ * ```
+ * type intlist = []int
+ * ```
+ */
+class AliasSpec extends @aliasspec, TypeSpec { }
+
+/**
+ * A type definition specifier.
+ *
+ * Examples:
+ *
+ * ```
+ * type status int
+ * ```
+ */
+class TypeDefSpec extends @typedefspec, TypeSpec { }
+
 /**
  * A field declaration, of a struct, a function (in which case this is a parameter or result variable),
  * or an interface (in which case this is a method or embedding spec).
diff --git a/ql/test/library-tests/semmle/go/Decl/TypeSpec.expected b/ql/test/library-tests/semmle/go/Decl/TypeSpec.expected
new file mode 100644
index 00000000000..73f614a03f1
--- /dev/null
+++ b/ql/test/library-tests/semmle/go/Decl/TypeSpec.expected
@@ -0,0 +1,2 @@
+| main.go:3:6:3:15 | type declaration specifier | status | int | def |
+| main.go:5:6:5:20 | type declaration specifier | intlist | []int | alias |
diff --git a/ql/test/library-tests/semmle/go/Decl/TypeSpec.ql b/ql/test/library-tests/semmle/go/Decl/TypeSpec.ql
new file mode 100644
index 00000000000..70a527d311c
--- /dev/null
+++ b/ql/test/library-tests/semmle/go/Decl/TypeSpec.ql
@@ -0,0 +1,5 @@
+import go
+
+from TypeSpec ts, string kind
+where if ts instanceof AliasSpec then kind = "alias" else kind = "def"
+select ts, ts.getName(), ts.getTypeExpr().getType().pp(), kind
diff --git a/ql/test/library-tests/semmle/go/Decl/main.go b/ql/test/library-tests/semmle/go/Decl/main.go
new file mode 100644
index 00000000000..dfd449d5476
--- /dev/null
+++ b/ql/test/library-tests/semmle/go/Decl/main.go
@@ -0,0 +1,5 @@
+package main
+
+type status int
+
+type intlist = []int
diff --git a/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/go.dbscheme b/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/go.dbscheme
new file mode 100644
index 00000000000..bcbec1b0e44
--- /dev/null
+++ b/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/go.dbscheme
@@ -0,0 +1,434 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref, string simple: string ref, string ext: string ref, int fromSource: int ref);
+
+folders(unique int id: @folder, string name: string ref, string simple: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @scopenode
+      | @comment_group | @comment;
+
+@documentable = @file | @field | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @sliceexpr
+| 14 = @typeassertexpr
+| 15 = @callorconversionexpr
+| 16 = @starexpr
+| 17 = @keyvalueexpr
+| 18 = @arraytypeexpr
+| 19 = @structtypeexpr
+| 20 = @functypeexpr
+| 21 = @interfacetypeexpr
+| 22 = @maptypeexpr
+| 23 = @plusexpr
+| 24 = @minusexpr
+| 25 = @notexpr
+| 26 = @complementexpr
+| 27 = @derefexpr
+| 28 = @addressexpr
+| 29 = @arrowexpr
+| 30 = @lorexpr
+| 31 = @landexpr
+| 32 = @eqlexpr
+| 33 = @neqexpr
+| 34 = @lssexpr
+| 35 = @leqexpr
+| 36 = @gtrexpr
+| 37 = @geqexpr
+| 38 = @addexpr
+| 39 = @subexpr
+| 40 = @orexpr
+| 41 = @xorexpr
+| 42 = @mulexpr
+| 43 = @quoexpr
+| 44 = @remexpr
+| 45 = @shlexpr
+| 46 = @shrexpr
+| 47 = @andexpr
+| 48 = @andnotexpr
+| 49 = @sendchantypeexpr
+| 50 = @recvchantypeexpr
+| 51 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @arraytype
+| 27 = @slicetype
+| 28 = @structtype
+| 29 = @pointertype
+| 30 = @interfacetype
+| 31 = @tupletype
+| 32 = @signaturetype
+| 33 = @maptype
+| 34 = @sendchantype
+| 35 = @recvchantype
+| 36 = @sendrcvchantype
+| 37 = @namedtype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @containertype | @structtype | @pointertype | @interfacetype | @tupletype | @signaturetype | @namedtype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/old.dbscheme b/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/old.dbscheme
new file mode 100644
index 00000000000..bcb9599aba6
--- /dev/null
+++ b/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/old.dbscheme
@@ -0,0 +1,431 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref, string simple: string ref, string ext: string ref, int fromSource: int ref);
+
+folders(unique int id: @folder, string name: string ref, string simple: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @scopenode
+      | @comment_group | @comment;
+
+@documentable = @file | @field | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @sliceexpr
+| 14 = @typeassertexpr
+| 15 = @callorconversionexpr
+| 16 = @starexpr
+| 17 = @keyvalueexpr
+| 18 = @arraytypeexpr
+| 19 = @structtypeexpr
+| 20 = @functypeexpr
+| 21 = @interfacetypeexpr
+| 22 = @maptypeexpr
+| 23 = @plusexpr
+| 24 = @minusexpr
+| 25 = @notexpr
+| 26 = @complementexpr
+| 27 = @derefexpr
+| 28 = @addressexpr
+| 29 = @arrowexpr
+| 30 = @lorexpr
+| 31 = @landexpr
+| 32 = @eqlexpr
+| 33 = @neqexpr
+| 34 = @lssexpr
+| 35 = @leqexpr
+| 36 = @gtrexpr
+| 37 = @geqexpr
+| 38 = @addexpr
+| 39 = @subexpr
+| 40 = @orexpr
+| 41 = @xorexpr
+| 42 = @mulexpr
+| 43 = @quoexpr
+| 44 = @remexpr
+| 45 = @shlexpr
+| 46 = @shrexpr
+| 47 = @andexpr
+| 48 = @andnotexpr
+| 49 = @sendchantypeexpr
+| 50 = @recvchantypeexpr
+| 51 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typespec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @arraytype
+| 27 = @slicetype
+| 28 = @structtype
+| 29 = @pointertype
+| 30 = @interfacetype
+| 31 = @tupletype
+| 32 = @signaturetype
+| 33 = @maptype
+| 34 = @sendchantype
+| 35 = @recvchantype
+| 36 = @sendrcvchantype
+| 37 = @namedtype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @containertype | @structtype | @pointertype | @interfacetype | @tupletype | @signaturetype | @namedtype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/upgrade.properties b/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/upgrade.properties
new file mode 100644
index 00000000000..13eb58608f5
--- /dev/null
+++ b/upgrades/bcb9599aba6c9ac4d617fac314b9a999b3a5b40e/upgrade.properties
@@ -0,0 +1,2 @@
+description: Extract more information about alias declarations
+compatibility: backwards

From 4eac5a1d4efc39ad9c22761bd7183ad05795817a Mon Sep 17 00:00:00 2001
From: Max Schaefer <max-schaefer@github.com>
Date: Fri, 10 Jul 2020 14:39:59 +0100
Subject: [PATCH 3/3] Add test to demonstrate that aliases have entities.

There are, however, no corresponding types.
---
 ql/test/library-tests/semmle/go/Decl/TypeEntities.expected | 2 ++
 ql/test/library-tests/semmle/go/Decl/TypeEntities.ql       | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 ql/test/library-tests/semmle/go/Decl/TypeEntities.expected
 create mode 100644 ql/test/library-tests/semmle/go/Decl/TypeEntities.ql

diff --git a/ql/test/library-tests/semmle/go/Decl/TypeEntities.expected b/ql/test/library-tests/semmle/go/Decl/TypeEntities.expected
new file mode 100644
index 00000000000..2de33d12407
--- /dev/null
+++ b/ql/test/library-tests/semmle/go/Decl/TypeEntities.expected
@@ -0,0 +1,2 @@
+| main.go:3:6:3:11 | status | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Decl | status |
+| main.go:5:6:5:12 | intlist | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Decl | []int |
diff --git a/ql/test/library-tests/semmle/go/Decl/TypeEntities.ql b/ql/test/library-tests/semmle/go/Decl/TypeEntities.ql
new file mode 100644
index 00000000000..14a54691250
--- /dev/null
+++ b/ql/test/library-tests/semmle/go/Decl/TypeEntities.ql
@@ -0,0 +1,4 @@
+import go
+
+from TypeEntity te
+select te, te.getPackage(), te.getType().pp()