[release-branch.go1] cmd/[568]g: correct freeing of allocated Regs.

««« backport f1028a23b059
cmd/[568]g: correct freeing of allocated Regs.

R=golang-dev, rsc
CC=golang-dev, remy
https://golang.org/cl/6281050

»»»

diff --git a/src/cmd/5g/reg.c b/src/cmd/5g/reg.c
index 93724d03265ac25fc9a10b40819bc4f85df0ee9d..3932669733cffcaa998f512f1d063709a076f430 100644 (file)
--- a/src/cmd/5g/reg.c
+++ b/src/cmd/5g/reg.c
@@ -695,8 +695,8 @@ brk:
                        }
                }
        }
-       if(r1 != R) {
-               r1->link = freer;
+       if(lastr != R) {
+               lastr->link = freer;
                freer = firstr;
        }
 

diff --git a/src/cmd/6g/reg.c b/src/cmd/6g/reg.c
index bed9f8da68bd9c4ec55af8644cc0340315898e06..049c63f17d4919184fbaad9845268b5b09ed7904 100644 (file)
--- a/src/cmd/6g/reg.c
+++ b/src/cmd/6g/reg.c
@@ -780,8 +780,8 @@ brk:
                                p->to.branch = p->to.branch->link;
        }
 
-       if(r1 != R) {
-               r1->link = freer;
+       if(lastr != R) {
+               lastr->link = freer;
                freer = firstr;
        }
 

diff --git a/src/cmd/8g/reg.c b/src/cmd/8g/reg.c
index 29270c8203a3b956bfda50142153194446806df2..45ffdf96c0a9bf7a337bc930c55ff548569cfe67 100644 (file)
--- a/src/cmd/8g/reg.c
+++ b/src/cmd/8g/reg.c
@@ -677,8 +677,8 @@ brk:
                                p->to.branch = p->to.branch->link;
        }
 
-       if(r1 != R) {
-               r1->link = freer;
+       if(lastr != R) {
+               lastr->link = freer;
                freer = firstr;
        }