mirror of
https://github.com/golang/go
synced 2024-11-05 18:36:08 +00:00
cmd/gc: fix order of channel evaluation of receive channels
Normally, an expression of the form x.f or *y can be reordered with function calls and communications. Select is stricter than normal: each channel expression is evaluated in source order. If you have case <-x.f and case <-foo(), then if the evaluation of x.f causes a panic, foo must not have been called. (This is in contrast to an expression like x.f + foo().) Enforce this stricter ordering. Fixes #8336. LGTM=dvyukov R=golang-codereviews, dvyukov CC=golang-codereviews, r https://golang.org/cl/126570043
This commit is contained in:
parent
f595f834be
commit
20e97677fd
2 changed files with 37 additions and 0 deletions
|
@ -771,6 +771,12 @@ orderstmt(Node *n, Order *order)
|
|||
// Special: clean case temporaries in each block entry.
|
||||
// Select must enter one of its blocks, so there is no
|
||||
// need for a cleaning at the end.
|
||||
// Doubly special: evaluation order for select is stricter
|
||||
// than ordinary expressions. Even something like p.c
|
||||
// has to be hoisted into a temporary, so that it cannot be
|
||||
// reordered after the channel evaluation for a different
|
||||
// case (if p were nil, then the timing of the fault would
|
||||
// give this away).
|
||||
t = marktemp(order);
|
||||
for(l=n->list; l; l=l->next) {
|
||||
if(l->n->op != OXCASE)
|
||||
|
@ -813,6 +819,8 @@ orderstmt(Node *n, Order *order)
|
|||
// r->left == N means 'case <-c'.
|
||||
// c is always evaluated; x and ok are only evaluated when assigned.
|
||||
orderexpr(&r->right->left, order);
|
||||
if(r->right->left->op != ONAME)
|
||||
r->right->left = ordercopyexpr(r->right->left, r->right->left->type, order, 0);
|
||||
|
||||
// Introduce temporary for receive and move actual copy into case body.
|
||||
// avoids problems with target being addressed, as usual.
|
||||
|
|
29
test/fixedbugs/issue8336.go
Normal file
29
test/fixedbugs/issue8336.go
Normal file
|
@ -0,0 +1,29 @@
|
|||
// run
|
||||
|
||||
// Copyright 2014 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 8336. Order of evaluation of receive channels in select.
|
||||
|
||||
package main
|
||||
|
||||
type X struct {
|
||||
c chan int
|
||||
}
|
||||
|
||||
func main() {
|
||||
defer func() {
|
||||
recover()
|
||||
}()
|
||||
var x *X
|
||||
select {
|
||||
case <-x.c: // should fault and panic before foo is called
|
||||
case <-foo():
|
||||
}
|
||||
}
|
||||
|
||||
func foo() chan int {
|
||||
println("BUG: foo must not be called")
|
||||
return make(chan int)
|
||||
}
|
Loading…
Reference in a new issue