cgo: generate correct multiple return value function invocations

Fixes #967.

R=rsc
CC=golang-dev
https://golang.org/cl/1855051

diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index 6cfd4d4646ff09dbaae4bf5f65a7519cbd7faaf4..3f62c4d69543d23a06c1fe0325c7c6aa79bc36d3 100644 (file)
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -419,8 +419,8 @@ func (p *Package) rewriteRef(f *File) {
                                        n.AddError = true
                                        n.Mangle = "_C2func_" + n.Go
                                        f.Name["2"+r.Name.Go] = n
-                                       expr = ast.NewIdent(n.Mangle)
                                }
+                               expr = ast.NewIdent(n.Mangle)
                                r.Name = n
                                break
                        }