cmd/link: move declarations into loops

(Split out from CL 22205.)

Change-Id: Id32698f48ce02b55c15b6f2842215e0ffdbf425b
Reviewed-on: https://go-review.googlesource.com/22298
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go
index 02f7897db93a6f6725d64c3a7c8aa1e566ebc9cf..15f0656aea0f0e70b2a5d362a4e7c622e292baa1 100644 (file)
--- a/src/cmd/link/internal/ld/elf.go
+++ b/src/cmd/link/internal/ld/elf.go
@@ -1692,8 +1692,6 @@ func elfrelocsect(sect *Section, first *LSym) {
        }
 
        eaddr := int32(sect.Vaddr + sect.Length)
-       var r *Reloc
-       var ri int
        for ; sym != nil; sym = sym.Next {
                if !sym.Attr.Reachable() {
                        continue
@@ -1703,8 +1701,8 @@ func elfrelocsect(sect *Section, first *LSym) {
                }
                Ctxt.Cursym = sym
 
-               for ri = 0; ri < len(sym.R); ri++ {
-                       r = &sym.R[ri]
+               for ri := 0; ri < len(sym.R); ri++ {
+                       r := &sym.R[ri]
                        if r.Done != 0 {
                                continue
                        }

diff --git a/src/cmd/link/internal/ld/macho.go b/src/cmd/link/internal/ld/macho.go
index e7d9fb5fe43d96bc0e2dd949e72fd2638fa98e96..6ca5ba58619757d7d1be6e538942ac0c144fa7b5 100644 (file)
--- a/src/cmd/link/internal/ld/macho.go
+++ b/src/cmd/link/internal/ld/macho.go
@@ -824,8 +824,6 @@ func machorelocsect(sect *Section, first *LSym) {
        }
 
        eaddr := int32(sect.Vaddr + sect.Length)
-       var r *Reloc
-       var ri int
        for ; sym != nil; sym = sym.Next {
                if !sym.Attr.Reachable() {
                        continue
@@ -835,8 +833,8 @@ func machorelocsect(sect *Section, first *LSym) {
                }
                Ctxt.Cursym = sym
 
-               for ri = 0; ri < len(sym.R); ri++ {
-                       r = &sym.R[ri]
+               for ri := 0; ri < len(sym.R); ri++ {
+                       r := &sym.R[ri]
                        if r.Done != 0 {
                                continue
                        }

diff --git a/src/cmd/link/internal/ld/pe.go b/src/cmd/link/internal/ld/pe.go
index 8985c4058858462d4ec43349deb821fa7ca51865..3b477fd846ed08a25d66935c988a99d06050b2e7 100644 (file)
--- a/src/cmd/link/internal/ld/pe.go
+++ b/src/cmd/link/internal/ld/pe.go
@@ -784,8 +784,6 @@ func perelocsect(sect *Section, first *LSym) int {
        }
 
        eaddr := int32(sect.Vaddr + sect.Length)
-       var r *Reloc
-       var ri int
        for ; sym != nil; sym = sym.Next {
                if !sym.Attr.Reachable() {
                        continue
@@ -795,8 +793,8 @@ func perelocsect(sect *Section, first *LSym) int {
                }
                Ctxt.Cursym = sym
 
-               for ri = 0; ri < len(sym.R); ri++ {
-                       r = &sym.R[ri]
+               for ri := 0; ri < len(sym.R); ri++ {
+                       r := &sym.R[ri]
                        if r.Done != 0 {
                                continue
                        }