From: Russ Cox <rsc@golang.org>
Date: Thu, 30 Jul 2009 18:03:58 +0000 (-0700)
Subject: fix build on amd64
X-Git-Tag: weekly.2009-11-06~1016
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=517e3457ccf76a3ac5fcfb364f2970206dc2eeef;p=gostls13.git

fix build on amd64

R=ken
OCL=32521
CL=32521
---

diff --git a/src/cmd/5g/ggen.c b/src/cmd/5g/ggen.c
index 9014cb407b..04fe16ce12 100644
--- a/src/cmd/5g/ggen.c
+++ b/src/cmd/5g/ggen.c
@@ -68,6 +68,8 @@ compile(Node *fn)
 	genlist(curfn->enter);
 	genlist(curfn->nbody);
 	checklabels();
+	if(nerrors != 0)
+		goto ret;
 
 	if(curfn->type->outtuple != 0)
 		ginscall(throwreturn, 0);
diff --git a/src/cmd/6g/ggen.c b/src/cmd/6g/ggen.c
index ea932e7824..d0f9ab3f91 100644
--- a/src/cmd/6g/ggen.c
+++ b/src/cmd/6g/ggen.c
@@ -70,6 +70,8 @@ compile(Node *fn)
 	genlist(curfn->nbody);
 	gclean();
 	checklabels();
+	if(nerrors != 0)
+		goto ret;
 
 	if(curfn->type->outtuple != 0)
 		ginscall(throwreturn, 0);
diff --git a/src/cmd/6g/list.c b/src/cmd/6g/list.c
index 799bacf9a2..5f71813c55 100644
--- a/src/cmd/6g/list.c
+++ b/src/cmd/6g/list.c
@@ -101,7 +101,10 @@ Dconv(Fmt *fp)
 		break;
 
 	case D_BRANCH:
-		snprint(str, sizeof(str), "%ld", a->branch->loc);
+		if(a->branch == nil)
+			snprint(str, sizeof(str), "<nil>");
+		else
+			snprint(str, sizeof(str), "%ld", a->branch->loc);
 		break;
 
 	case D_EXTERN:
diff --git a/src/cmd/8g/ggen.c b/src/cmd/8g/ggen.c
index 3a44d64f01..ee26a61109 100644
--- a/src/cmd/8g/ggen.c
+++ b/src/cmd/8g/ggen.c
@@ -68,6 +68,8 @@ compile(Node *fn)
 	genlist(curfn->nbody);
 	gclean();
 	checklabels();
+	if(nerrors != 0)
+		goto ret;
 
 	if(curfn->type->outtuple != 0)
 		ginscall(throwreturn, 0);