From: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Date: Thu, 2 Sep 2021 03:42:43 +0000 (+0700)
Subject: cmd/compile: use types2.Unsafe to represent package unsafe in gcimports
X-Git-Tag: go1.18beta1~1519
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3db4888a05fb15035d332a360cb610f2c05370ab;p=gostls13.git

cmd/compile: use types2.Unsafe to represent package unsafe in gcimports

Followup todo in CL 346769.

Change-Id: I6c870014523426d65d135da999f97a818a997237
Reviewed-on: https://go-review.googlesource.com/c/go/+/347270
Trust: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/cmd/compile/internal/noder/irgen.go b/src/cmd/compile/internal/noder/irgen.go
index 70f7991a8e..fd29c51c8a 100644
--- a/src/cmd/compile/internal/noder/irgen.go
+++ b/src/cmd/compile/internal/noder/irgen.go
@@ -35,7 +35,7 @@ func checkFiles(noders []*noder) (posMap, *types2.Package, *types2.Info) {
 
 	// typechecking
 	importer := gcimports{
-		packages: make(map[string]*types2.Package),
+		packages: map[string]*types2.Package{"unsafe": types2.Unsafe},
 	}
 	conf := types2.Config{
 		GoVersion:             base.Flag.Lang,
diff --git a/src/cmd/compile/internal/noder/reader2.go b/src/cmd/compile/internal/noder/reader2.go
index a775ffda34..cffa037236 100644
--- a/src/cmd/compile/internal/noder/reader2.go
+++ b/src/cmd/compile/internal/noder/reader2.go
@@ -147,10 +147,6 @@ func (r *reader2) doPkg() *types2.Package {
 	if path == "builtin" {
 		return nil // universe
 	}
-	if path == "unsafe" {
-		// TODO(mdempsky): This should be in r.p.imports.
-		return types2.Unsafe
-	}
 	if path == "" {
 		path = r.p.pkgPath
 	}