Skip to content

Commit

Permalink
cmd/gc: correctly typecheck expression lists in returns.
Browse files Browse the repository at this point in the history
Invalid return statements were accidentally compiling or
triggering internal errors.
Fixes #3044.

R=golang-dev, rsc
CC=golang-dev, remy
https://golang.org/cl/5673074
  • Loading branch information
remyoudompheng committed Feb 16, 2012
1 parent f43d2b7 commit 1d3ca92
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/cmd/gc/typecheck.c
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,10 @@ typecheck1(Node **np, int top)

case ORETURN:
ok |= Etop;
typechecklist(n->list, Erv | Efnstruct);
if(count(n->list) == 1)
typechecklist(n->list, Erv | Efnstruct);
else
typechecklist(n->list, Erv);
if(curfn == N) {
yyerror("return outside function");
goto error;
Expand Down
22 changes: 22 additions & 0 deletions test/fixedbugs/bug418.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// errchk $G $D/$F.go

// Copyright 2012 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 3044.
// Multiple valued expressions in return lists.

package p

func Two() (a, b int)

// F used to compile.
func F() (x interface{}, y int) {
return Two(), 0 // ERROR "single-value context"
}

// Recursive used to trigger an internal compiler error.
func Recursive() (x interface{}, y int) {
return Recursive(), 0 // ERROR "single-value context"
}

0 comments on commit 1d3ca92

Please sign in to comment.