code review 800041: arm: fix build

arm: fix build

[dpx, 2010-03-27 05:33:58]

Hello rsc (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[rsc, 2010-03-27 06:06:18]

LGTM


thanks for keeping on top of this.  sorry.


On Fri, Mar 26, 2010 at 22:33,  <dean.prichard@gmail.com> wrote:
> Reviewers: rsc,
>
> Message:
> Hello rsc (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change.
>
>
> Description:
> arm: fix build
>
> Please review this at http://codereview.appspot.com/800041/show
>
> Affected files:
>  M src/cmd/5g/ggen.c
>  M test/arm-pass.txt
>
>
> Index: src/cmd/5g/ggen.c
> ===================================================================
> --- a/src/cmd/5g/ggen.c
> +++ b/src/cmd/5g/ggen.c
> @@ -87,10 +87,8 @@
>
>        if(pret)
>                patch(pret, pc);
> -       ginit();
>        if(curfn->exit)
>                genlist(curfn->exit);
> -       gclean();
>        if(nerrors != 0)
>                goto ret;
>        if(hasdefer)
> @@ -427,9 +425,10 @@
>  cgen_ret(Node *n)
>  {
>        genlist(n->list);               // copy out args
> -       if(hasdefer)
> -               ginscall(deferreturn, 0);
> -       gins(ARET, N, N);
> +       if(hasdefer || curfn->exit)
> +               gjmp(pret);
> +       else
> +               gins(ARET, N, N);
>  }
>
>  /*
> Index: test/arm-pass.txt
> ===================================================================
> --- a/test/arm-pass.txt
> +++ b/test/arm-pass.txt
> @@ -27,7 +27,6 @@
>  declbad.go
>  empty.go
>  escape.go
> -escape1.go
>  fixedbugs/bug000.go
>  fixedbugs/bug001.go
>  fixedbugs/bug002.go
>
>
>

[rsc, 2010-03-27 06:27:26]

*** Submitted as http://code.google.com/p/go/source/detail?r=64ae81520c6c ***

arm: fix build

R=rsc
CC=golang-dev
http://codereview.appspot.com/800041

Committer: Russ Cox <rsc@golang.org>