From: Daniel Morsing <daniel.morsing@gmail.com>
Date: Tue, 16 Jul 2013 09:43:11 +0000 (+0200)
Subject: cmd/gc: fix incorrect error when using f(g()) form on ... args
X-Git-Tag: go1.2rc2~1041
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7e270cf6c4be9ddc240c2661c18f163728cbb897;p=gostls13.git

cmd/gc: fix incorrect error when using f(g()) form on ... args

Fixes #5358.

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

diff --git a/src/cmd/gc/typecheck.c b/src/cmd/gc/typecheck.c
index 54ce5b3ea6..f232efdaf8 100644
--- a/src/cmd/gc/typecheck.c
+++ b/src/cmd/gc/typecheck.c
@@ -2131,9 +2131,9 @@ typecheckaste(int op, Node *call, int isddd, Type *tstruct, NodeList *nl, char *
 				for(; tn; tn=tn->down) {
 					if(assignop(tn->type, tl->type->type, &why) == 0) {
 						if(call != N)
-							yyerror("cannot use %T as type %T in argument to %N%s", tn->type, tl->type, call, why);
+							yyerror("cannot use %T as type %T in argument to %N%s", tn->type, tl->type->type, call, why);
 						else
-							yyerror("cannot use %T as type %T in %s%s", tn->type, tl->type, desc, why);
+							yyerror("cannot use %T as type %T in %s%s", tn->type, tl->type->type, desc, why);
 					}
 				}
 				goto out;
diff --git a/test/fixedbugs/issue5358.go b/test/fixedbugs/issue5358.go
new file mode 100644
index 0000000000..75aa9533d2
--- /dev/null
+++ b/test/fixedbugs/issue5358.go
@@ -0,0 +1,17 @@
+// errorcheck
+
+// Copyright 2013 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// issue 5358: incorrect error message when using f(g()) form on ... args.
+
+package main
+
+func f(x int, y ...int) {}
+
+func g() (int, []int)
+
+func main() {
+	f(g()) // ERROR "as type int in"
+}