From: Russ Cox <rsc@golang.org>
Date: Thu, 16 Jun 2011 05:35:30 +0000 (-0400)
Subject: [release-branch.r57] 6g, 8g: fix goto fix
X-Git-Tag: release.r57.2~3
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0587bf529495d09659985fdb13115a67936d90e8;p=gostls13.git

[release-branch.r57] 6g, 8g: fix goto fix

««« CL 4632041 / cbc2b570b2ca
6g, 8g: fix goto fix

R=ken2
CC=golang-dev
https://golang.org/cl/4632041
»»»

R=adg
CC=golang-dev
https://golang.org/cl/4631042
---

diff --git a/src/cmd/6g/gsubr.c b/src/cmd/6g/gsubr.c
index f224dfd9f2..78b8c4351c 100644
--- a/src/cmd/6g/gsubr.c
+++ b/src/cmd/6g/gsubr.c
@@ -125,7 +125,7 @@ clearstk(void)
 {
 	Plist *pl;
 	Prog *p1, *p2;
-	Node sp, di, cx, con;
+	Node sp, di, cx, con, ax;
 
 	if((uint32)plast->firstpc->to.offset <= 0)
 		return;
@@ -147,6 +147,9 @@ clearstk(void)
 	gins(ACLD, N, N);
 	gins(AMOVQ, &sp, &di);
 	gins(AMOVQ, &con, &cx);
+	nodconst(&con, types[TUINT64], 0);
+	nodreg(&ax, types[TUINT64], D_AX);
+	gins(AMOVQ, &con, &ax);
 	gins(AREP, N, N);
 	gins(ASTOSQ, N, N);
 
diff --git a/src/cmd/8g/gsubr.c b/src/cmd/8g/gsubr.c
index de1d323f83..ae9901eeba 100644
--- a/src/cmd/8g/gsubr.c
+++ b/src/cmd/8g/gsubr.c
@@ -127,7 +127,7 @@ clearstk(void)
 {
 	Plist *pl;
 	Prog *p1, *p2;
-	Node sp, di, cx, con;
+	Node sp, di, cx, con, ax;
 
 	if(plast->firstpc->to.offset <= 0)
 		return;
@@ -149,6 +149,9 @@ clearstk(void)
 	gins(ACLD, N, N);
 	gins(AMOVL, &sp, &di);
 	gins(AMOVL, &con, &cx);
+	nodconst(&con, types[TUINT32], 0);
+	nodreg(&ax, types[TUINT32], D_AX);
+	gins(AMOVL, &con, &ax);
 	gins(AREP, N, N);
 	gins(ASTOSL, N, N);