diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:22:53 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:22:53 +0200 |
| commit | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (patch) | |
| tree | 4449f2036cccf162e8417cc5841a35815b3e7ac5 /src/cmd/gc/inl.c | |
| parent | c8bf49ef8a92e2337b69c14b9b88396efe498600 (diff) | |
| download | golang-51f2ca399fb8da86b2e7b3a0582e083fab731a98.tar.gz | |
Imported Upstream version 1.3upstream/1.3
Diffstat (limited to 'src/cmd/gc/inl.c')
| -rw-r--r-- | src/cmd/gc/inl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cmd/gc/inl.c b/src/cmd/gc/inl.c index 6800884a0..cf89b0090 100644 --- a/src/cmd/gc/inl.c +++ b/src/cmd/gc/inl.c @@ -392,6 +392,8 @@ inlnode(Node **np) case OCALLFUNC: case OCALLMETH: case OCALLINTER: + case OAPPEND: + case OCOMPLEX: // if we just replaced arg in f(arg()) or return arg with an inlined call // and arg returns multiple values, glue as list if(count(n->list) == 1 && n->list->n->op == OINLCALL && count(n->list->n->rlist) > 1) { @@ -800,6 +802,7 @@ inlvar(Node *var) n->class = PAUTO; n->used = 1; n->curfn = curfn; // the calling function, not the called one + n->addrtaken = var->addrtaken; // esc pass wont run if we're inlining into a iface wrapper // luckily, we can steal the results from the target func |