cmd/5g, cmd/8g: fix build

Botched during CL 83090046.

TBR=khr
CC=golang-codereviews
https://golang.org/cl/83070046

diff --git a/src/cmd/5g/ggen.c b/src/cmd/5g/ggen.c
index c85f680cdad1c233bbadb9df1efe1af6944b4774..b5173a2137f95d0f3ac55545e91b1a036c508359 100644 (file)
--- a/src/cmd/5g/ggen.c
+++ b/src/cmd/5g/ggen.c
@@ -472,13 +472,13 @@ cgen_ret(Node *n)
 {
        Prog *p;
 
-       genlist(n->list);               // copy out args
-       if(hasdefer || curfn->exit) {
-               gjmp(retpc);
-               return;
-       }
+       if(n != N)
+               genlist(n->list);               // copy out args
+       if(hasdefer)
+               ginscall(deferreturn, 0);
+       genlist(curfn->exit);
        p = gins(ARET, N, N);
-       if(n->op == ORETJMP) {
+       if(n != N && n->op == ORETJMP) {
                p->to.name = D_EXTERN;
                p->to.type = D_CONST;
                p->to.sym = linksym(n->left->sym);

diff --git a/src/cmd/8g/ggen.c b/src/cmd/8g/ggen.c
index 2ece1881280497e73e297b2d8923850796cc7e1a..8388e64bd50225f0e455762781080f838562da97 100644 (file)
--- a/src/cmd/8g/ggen.c
+++ b/src/cmd/8g/ggen.c
@@ -462,13 +462,13 @@ cgen_ret(Node *n)
 {
        Prog *p;
 
-       genlist(n->list);               // copy out args
-       if(retpc) {
-               gjmp(retpc);
-               return;
-       }
+       if(n != N)
+               genlist(n->list);               // copy out args
+       if(hasdefer)
+               ginscall(deferreturn, 0);
+       genlist(curfn->exit);
        p = gins(ARET, N, N);
-       if(n->op == ORETJMP) {
+       if(n != N && n->op == ORETJMP) {
                p->to.type = D_EXTERN;
                p->to.sym = linksym(n->left->sym);
        }