Commit 55b145e3 authored by Dean Prichard's avatar Dean Prichard Committed by Russ Cox

arm: fix build

R=rsc
CC=golang-dev
https://golang.org/cl/800041
parent 97d0e8fe
...@@ -87,10 +87,8 @@ compile(Node *fn) ...@@ -87,10 +87,8 @@ compile(Node *fn)
if(pret) if(pret)
patch(pret, pc); patch(pret, pc);
ginit();
if(curfn->exit) if(curfn->exit)
genlist(curfn->exit); genlist(curfn->exit);
gclean();
if(nerrors != 0) if(nerrors != 0)
goto ret; goto ret;
if(hasdefer) if(hasdefer)
...@@ -427,9 +425,10 @@ void ...@@ -427,9 +425,10 @@ void
cgen_ret(Node *n) cgen_ret(Node *n)
{ {
genlist(n->list); // copy out args genlist(n->list); // copy out args
if(hasdefer) if(hasdefer || curfn->exit)
ginscall(deferreturn, 0); gjmp(pret);
gins(ARET, N, N); else
gins(ARET, N, N);
} }
/* /*
......
...@@ -27,7 +27,6 @@ convlit1.go ...@@ -27,7 +27,6 @@ convlit1.go
declbad.go declbad.go
empty.go empty.go
escape.go escape.go
escape1.go
fixedbugs/bug000.go fixedbugs/bug000.go
fixedbugs/bug001.go fixedbugs/bug001.go
fixedbugs/bug002.go fixedbugs/bug002.go
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment