touch ups

Author: grantnelson-wf

compiler/compiler_test.go

@@ -380,15 +380,16 @@ func TestDeclSelection_RemoveUnusedNestedTypesInFunction(t *testing.T) {
 
 	srcFiles := []srctesting.Source{{Name: `main.go`, Contents: []byte(src)}}
 	sel := declSelection(t, srcFiles, nil)
+	sel.PrintDeclStatus()
 	sel.IsAlive(`func:command-line-arguments.main`)
 
 	sel.IsAlive(`funcVar:command-line-arguments.Foo`)
 	sel.IsAlive(`func:command-line-arguments.Foo<string>`)
 	sel.IsDead(`func:command-line-arguments.Foo<int>`)
 
 	sel.IsAlive(`typeVar:command-line-arguments.Bar`)
-	sel.IsAlive(`type:command-line-arguments.Bar<string;>@main.go:4:9`)
-	sel.IsDead(`type:command-line-arguments.Bar<int;>@main.go:4:9`)
+	sel.IsAlive(`type:nested:command-line-arguments.Bar<string;>@main.go:4:9`)
+	sel.IsDead(`type:nested:command-line-arguments.Bar<int;>@main.go:4:9`)
 
 	sel.IsDead(`funcVar:command-line-arguments.deadCode`)
 	sel.IsDead(`func:command-line-arguments.deadCode`)
@@ -413,6 +414,7 @@ func TestDeclSelection_RemoveUnusedNestedTypesInMethod(t *testing.T) {
 
 	srcFiles := []srctesting.Source{{Name: `main.go`, Contents: []byte(src)}}
 	sel := declSelection(t, srcFiles, nil)
+	sel.PrintDeclStatus()
 	sel.IsAlive(`func:command-line-arguments.main`)
 
 	sel.IsAlive(`typeVar:command-line-arguments.Baz`)
@@ -423,8 +425,8 @@ func TestDeclSelection_RemoveUnusedNestedTypesInMethod(t *testing.T) {
 	sel.IsAlive(`func:command-line-arguments.(*Baz).Foo<string>`)
 
 	sel.IsAlive(`typeVar:command-line-arguments.Bar`)
-	sel.IsDead(`type:command-line-arguments.Bar<int;>@main.go:5:9`)
-	sel.IsAlive(`type:command-line-arguments.Bar<string;>@main.go:5:9`)
+	sel.IsDead(`type:nested:command-line-arguments.Bar<int;>@main.go:5:9`)
+	sel.IsAlive(`type:nested:command-line-arguments.Bar<string;>@main.go:5:9`)
 
 	sel.IsDead(`funcVar:command-line-arguments.deadCode`)
 	sel.IsDead(`func:command-line-arguments.deadCode`)
@@ -453,8 +455,8 @@ func TestDeclSelection_RemoveAllUnusedNestedTypes(t *testing.T) {
 	sel.IsDead(`func:command-line-arguments.Foo<int>`)
 
 	sel.IsDead(`typeVar:command-line-arguments.Bar`)
-	sel.IsDead(`type:command-line-arguments.Bar<string;>@main.go:4:9`)
-	sel.IsDead(`type:command-line-arguments.Bar<int;>@main.go:4:9`)
+	sel.IsDead(`type:nested:command-line-arguments.Bar<string;>@main.go:4:9`)
+	sel.IsDead(`type:nested:command-line-arguments.Bar<int;>@main.go:4:9`)
 
 	sel.IsDead(`funcVar:command-line-arguments.deadCode`)
 	sel.IsDead(`func:command-line-arguments.deadCode`)
@@ -482,7 +484,7 @@ func TestDeclSelection_CompletelyRemoveNestedType(t *testing.T) {
 	sel.IsDead(`func:command-line-arguments.Foo<int>`)
 
 	sel.IsDead(`typeVar:command-line-arguments.Bar`)
-	sel.IsDead(`type:command-line-arguments.Bar<int;>@main.go:4:9`)
+	sel.IsDead(`type:nested:command-line-arguments.Bar<int;>@main.go:4:9`)
 
 	sel.IsDead(`funcVar:command-line-arguments.deadCode`)
 	sel.IsDead(`func:command-line-arguments.deadCode`)

compiler/declCache.go

@@ -83,6 +83,10 @@ func (dc *DeclCache) Read(decode func(any) error) error {
 		if err := decode(decl); err != nil {
 			return err
 		}
+		if decl.ForGeneric || isUnqueDeclFullName(decl.FullName) {
+			// These declarations should not have been cached.
+			continue
+		}
 		dc.decls[decl.FullName] = decl
 	}
 	return nil

compiler/sources/serializer.go

@@ -1,23 +1,12 @@
 package sources
 
 import (
-	"bytes"
 	"encoding/gob"
 	"go/ast"
 	"go/token"
 	"sync"
 )
 
-func (s *Sources) GobEncode() ([]byte, error) {
-	buf := &bytes.Buffer{}
-	err := s.Write(gob.NewEncoder(buf).Encode)
-	return buf.Bytes(), err
-}
-
-func (s *Sources) GobDecode(data []byte) error {
-	return s.Read(gob.NewDecoder(bytes.NewReader(data)).Decode)
-}
-
 // Write will call encode multiple times to write the various fields
 // of the sources. This is designed to be used with a gob.Encoder.
 //