← Back to branch summary

~ubuntu-branches/ubuntu/vivid/golang/vivid

« back to all changes in this revision

Viewing changes to src/cmd/gc/racewalk.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-11-18 15:12:26 UTC
  • mfrom: (14.2.12 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141118151226-zug7vn93mn3dtiz3
Tags: 2:1.3.2-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - Support co-installability with gccgo-go tool:
    - d/rules,golang-go.install: Rename bin/go -> bin/golang-go
    - d/golang-go.{postinst,prerm}: Install/remove /usr/bin/go using
      alternatives.
  - d/copyright: Amendments for full compiliance with copyright format.
  - d/control: Demote golang-go.tools to Suggests to support Ubuntu MIR.
  - dropped patches (now upstream):
    - d/p/issue27650045_40001_50001.diff
    - d/p/issue28050043_60001_70001.diff
    - d/p/issue54790044_100001_110001.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cmd/gc/racewalk.c
166
166
                goto ret;
167
167
 
168
168
        case OCFUNC:
 
169
        case OVARKILL:
169
170
                // can't matter
170
171
                goto ret;
171
172
 
181
182
                        // x, y := f() becomes BLOCK{CALL f, AS x [SP+0], AS y [SP+n]}
182
183
                        // We don't want to instrument between the statements because it will
183
184
                        // smash the results.
184
 
                        racewalknode(&n->list->n, &n->ninit, 0, 0);
 
185
                        racewalknode(&n->list->n, &n->list->n->ninit, 0, 0);
185
186
                        fini = nil;
186
187
                        racewalklist(n->list->next, &fini);
187
188
                        n->list = concat(n->list, fini);