Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Clean merge.

Change-Id: I94ac733fd3147abf42d89ccbfcc68f54ed5f4d13
This commit is contained in:
Cherry Zhang 2020-04-06 10:59:39 -04:00
commit c8d89ddb18
72 changed files with 1579 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cmd/link/internal/ld/lib.go
View file

@ -2361,6 +2361,7 @@ func (sc *stkChk) check(up *chain, depth int) int {
relocs := ldr.Relocs(s)
var ch1 chain
pcsp := obj.NewPCIter(uint32(ctxt.Arch.MinLC))
ri := 0
for pcsp.Init(info.Pcsp()); !pcsp.Done; pcsp.Next() {
// pcsp.value is in effect for [pcsp.pc, pcsp.nextpc).
@ -2371,8 +2372,8 @@ func (sc *stkChk) check(up *chain, depth int) int {
}
// Process calls in this span.
for i := 0; i < relocs.Count(); i++ {
r := relocs.At2(i)
for ; ri < relocs.Count(); ri++ {
r := relocs.At2(ri)
if uint32(r.Off()) >= pcsp.NextPC {
break
}