From: Cherry Zhang <cherryyz@google.com>
Date: Fri, 11 Sep 2020 16:07:44 +0000 (-0400)
Subject: [dev.link] all: merge branch 'master' into dev.link
X-Git-Tag: go1.16beta1~877^2^2~3
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3ab22052fbe784088cf8e4edf686707c54f51cf2;p=gostls13.git

[dev.link] all: merge branch 'master' into dev.link

Clean merge.

Change-Id: Ib773b0bc00fd99d494f9331c3613bcc8285e48e3
---

3ab22052fbe784088cf8e4edf686707c54f51cf2
diff --cc src/cmd/link/internal/loader/loader.go
index ea9cd1bd2e,43a0352e0b..af51d9eb88
--- a/src/cmd/link/internal/loader/loader.go
+++ b/src/cmd/link/internal/loader/loader.go
@@@ -328,10 -329,10 +329,10 @@@ func NewLoader(flags uint32, elfsetstri
  	ldr := &Loader{
  		start:                make(map[*oReader]Sym),
  		objs:                 []objIdx{{}, {extReader, 0}}, // reserve index 0 for nil symbol, 1 for external symbols
 -		objSyms:              make([]objSym, 1, 100000),    // reserve index 0 for nil symbol
 +		objSyms:              make([]objSym, 1, 1),         // This will get overwritten later.
  		extReader:            extReader,
  		symsByName:           [2]map[string]Sym{make(map[string]Sym, 80000), make(map[string]Sym, 50000)}, // preallocate ~2MB for ABI0 and ~1MB for ABI1 symbols
- 		objByPkg:             make(map[string]*oReader),
+ 		objByPkg:             make(map[string]uint32),
  		outer:                make(map[Sym]Sym),
  		sub:                  make(map[Sym]Sym),
  		dynimplib:            make(map[Sym]string),