From aa3d50130bb944fccccf35d400a44e6e4153d1c7 Mon Sep 17 00:00:00 2001
From: Josh Baum <joshbaum@google.com>
Date: Tue, 30 Jun 2020 09:38:00 -0400
Subject: [PATCH] internal/analysisinternal: prevent fillstruct panic on nil
 package

The previous implementation missed a nil check which caused a panic
when the package of a type was nil.

Fixes: golang/go#39899
Change-Id: I2dfb50d6b79f52df367e093e5d857cd70b7cef27
Reviewed-on: https://go-review.googlesource.com/c/tools/+/240537
Run-TryBot: Josh Baum <joshbaum@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
---
 internal/analysisinternal/analysis.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/analysisinternal/analysis.go b/internal/analysisinternal/analysis.go
index 14b96a79fa..c7f5cd54bb 100644
--- a/internal/analysisinternal/analysis.go
+++ b/internal/analysisinternal/analysis.go
@@ -80,6 +80,9 @@ func TypeExpr(fset *token.FileSet, f *ast.File, pkg *types.Package, typ types.Ty
 			return ast.NewIdent(t.Name())
 		}
 	case *types.Named:
+		if t.Obj().Pkg() == nil {
+			return nil
+		}
 		if t.Obj().Pkg() == pkg {
 			return ast.NewIdent(t.Obj().Name())
 		}