From: Cherry Zhang <cherryyz@google.com>
Date: Fri, 25 Oct 2019 17:41:36 +0000 (-0400)
Subject: [dev.link] all: merge branch 'master' into dev.link
X-Git-Tag: go1.14beta1~292^2^2~25
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d77b809df908d81406ceced91fe1b1399f1e29f1;p=gostls13.git

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

The only conflict is in cmd/internal/obj/link.go and the
resolution is trivial.

Change-Id: Ic79b760865a972a0ab68291d06386531d012de86
---

d77b809df908d81406ceced91fe1b1399f1e29f1
diff --cc src/cmd/internal/obj/link.go
index 2e94d55225,468e9402ee..76c6f261a3
--- a/src/cmd/internal/obj/link.go
+++ b/src/cmd/internal/obj/link.go
@@@ -409,12 -405,11 +409,13 @@@ type FuncInfo struct 
  	dwarfAbsFnSym      *LSym
  	dwarfDebugLinesSym *LSym
  
- 	GCArgs       *LSym
- 	GCLocals     *LSym
- 	GCRegs       *LSym
- 	StackObjects *LSym
+ 	GCArgs             *LSym
+ 	GCLocals           *LSym
+ 	GCRegs             *LSym
+ 	StackObjects       *LSym
+ 	OpenCodedDeferInfo *LSym
 +
 +	FuncInfoSym *LSym
  }
  
  type InlMark struct {