qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 21:34:40 -07:00
Code Releases Activity

cmd/gc: correctly typecheck expression lists in returns.

Browse Source 
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
This commit is contained in:
Rémy Oudompheng 2012-02-16 23:42:19 +01:00
parent f43d2b7fa8
commit 1d3ca9236e
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmd/gc/typecheck.c
View File

@ -1410,7 +1410,10 @@ reswitch:
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;

22
test/fixedbugs/bug418.go Normal file
View File

@ -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"
}