From: Christian Himpel <chressie@googlemail.com>
Date: Thu, 5 Aug 2010 00:15:04 +0000 (-0700)
Subject: cgo: generate correct multiple return value function invocations
X-Git-Tag: weekly.2010-08-04~8
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6b8ec5c57216d94a8bcf1179574785122a9af88d;p=gostls13.git

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 6cfd4d4646..3f62c4d695 100644
--- 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
 			}