gopls/internal/lsp/cache: use types.Unsafe in analysisPackage

Before, the early return in typeCheck forgot to set an.types.
Now the logic is pulled into single spot in the caller.

This change consolidates the various places that set
analysisNode.types to just two (syntax and export).

Change-Id: I2f1ea6b70888bd5874f76c57443fe46b1c04ae67
Reviewed-on: https://go-review.googlesource.com/c/tools/+/504558
TryBot-Result: Gopher Robot <[email protected]>
Run-TryBot: Alan Donovan <[email protected]>
Auto-Submit: Alan Donovan <[email protected]>
gopls-CI: kokoro <[email protected]>
Reviewed-by: Robert Findley <[email protected]>

Author: adonovan

gopls/internal/lsp/cache/analysis.go

@@ -229,11 +229,6 @@ func (snapshot *snapshot) Analyze(ctx context.Context, pkgs map[PackageID]unit,
 				allDeps:    make(map[PackagePath]*analysisNode),
 				exportDeps: make(map[PackagePath]*analysisNode),
 			}
-			// Unsafe must use a distinguished types.Package.
-			// Mark it as fully populated from birth.
-			if m.PkgPath == "unsafe" {
-				an.typesOnce.Do(func() { an.types = types.Unsafe })
-			}
 			nodes[id] = an
 
 			// -- recursion --
@@ -405,6 +400,11 @@ func (an *analysisNode) String() string { return string(an.m.ID) }
 // Postcondition: an.types and an.exportDeps are populated.
 func (an *analysisNode) _import() *types.Package {
 	an.typesOnce.Do(func() {
+		if an.m.PkgPath == "unsafe" {
+			an.types = types.Unsafe
+			return
+		}
+
 		an.types = types.NewPackage(string(an.m.PkgPath), string(an.m.Name))
 
 		// getPackages recursively imports each dependency
@@ -662,6 +662,12 @@ func (an *analysisNode) run(ctx context.Context) (*analyzeSummary, error) {
 	// Type-check the package syntax.
 	pkg := an.typeCheck(parsed)
 
+	// Publish the completed package.
+	an.typesOnce.Do(func() { an.types = pkg.types })
+	if an.types != pkg.types {
+		log.Fatalf("typesOnce prematurely done")
+	}
+
 	// Compute the union of exportDeps across our direct imports.
 	// This is the set that will be needed by the fact decoder.
 	allExportDeps := make(map[PackagePath]*analysisNode)
@@ -747,18 +753,17 @@ func (an *analysisNode) run(ctx context.Context) (*analyzeSummary, error) {
 	}, nil
 }
 
-// Postcondition: an.types and an.exportDeps are populated.
+// Postcondition: analysisPackage.types and an.exportDeps are populated.
 func (an *analysisNode) typeCheck(parsed []*source.ParsedGoFile) *analysisPackage {
 	m := an.m
-	fset := an.fset
 
 	if false { // debugging
 		log.Println("typeCheck", m.ID)
 	}
 
 	pkg := &analysisPackage{
 		m:        m,
-		fset:     fset,
+		fset:     an.fset,
 		parsed:   parsed,
 		files:    make([]*ast.File, len(parsed)),
 		compiles: len(m.Errors) == 0, // false => list error
@@ -777,6 +782,7 @@ func (an *analysisNode) typeCheck(parsed []*source.ParsedGoFile) *analysisPackag
 
 	// Unsafe has no syntax.
 	if m.PkgPath == "unsafe" {
+		pkg.types = types.Unsafe
 		return pkg
 	}
 
@@ -862,7 +868,7 @@ func (an *analysisNode) typeCheck(parsed []*source.ParsedGoFile) *analysisPackag
 	// TODO(adonovan): do we actually need this??
 	typesinternal.SetUsesCgo(cfg)
 
-	check := types.NewChecker(cfg, fset, pkg.types, pkg.typesInfo)
+	check := types.NewChecker(cfg, pkg.fset, pkg.types, pkg.typesInfo)
 
 	// Type checking errors are handled via the config, so ignore them here.
 	_ = check.Files(pkg.files)
@@ -874,12 +880,6 @@ func (an *analysisNode) typeCheck(parsed []*source.ParsedGoFile) *analysisPackag
 		}
 	}
 
-	// Publish the completed package.
-	an.typesOnce.Do(func() { an.types = pkg.types })
-	if an.types != pkg.types {
-		log.Fatalf("typesOnce prematurely done")
-	}
-
 	// Emit the export data and compute the recursive hash.
 	export, err := gcimporter.IExportShallow(pkg.fset, pkg.types)
 	if err != nil {