From: Russ Cox <rsc@golang.org>
Date: Thu, 19 Nov 2020 22:16:50 +0000 (-0500)
Subject: [dev.regabi] cmd/compile: initialize importMap lazily
X-Git-Tag: go1.17beta1~1539^2~479
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5fd949e4bd;p=gostls13.git

[dev.regabi] cmd/compile: initialize importMap lazily

This sets up the next CL, moving importMap to a global zeroed struct.

Change-Id: I1acc91b440d3da6e28fb32bd275fb3cd36db4e97
Reviewed-on: https://go-review.googlesource.com/c/go/+/272046
Trust: Russ Cox <rsc@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index 61742fc8ce..d1b4161277 100644
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -877,11 +877,14 @@ func writebench(filename string) error {
 }
 
 var (
-	importMap   = map[string]string{}
+	importMap   map[string]string
 	packageFile map[string]string // nil means not in use
 )
 
 func addImportMap(s string) {
+	if importMap == nil {
+		importMap = make(map[string]string)
+	}
 	if strings.Count(s, "=") != 1 {
 		log.Fatal("-importmap argument must be of the form source=actual")
 	}
@@ -894,6 +897,9 @@ func addImportMap(s string) {
 }
 
 func readImportCfg(file string) {
+	if importMap == nil {
+		importMap = make(map[string]string)
+	}
 	packageFile = map[string]string{}
 	data, err := ioutil.ReadFile(file)
 	if err != nil {