go.tools/go/ssa: simplify builder.exprN now that go/types emits correct types.

(Follow-up to fix of issue 7060.)

Also: comment fixes.

R=gri
CC=golang-codereviews
https://golang.org/cl/47670043

go/ssa/builder.go

@@ -185,8 +185,7 @@ func (b *builder) logicalBinop(fn *Function, e *ast.BinaryExpr) Value {
 // is token.ARROW).
 //
 func (b *builder) exprN(fn *Function, e ast.Expr) Value {
-	var typ types.Type
+	typ := fn.Pkg.typeOf(e).(*types.Tuple)
-	var tuple Value
 	switch e := e.(type) {
 	case *ast.ParenExpr:
 		return b.exprN(fn, e.X)
@@ -197,49 +196,34 @@ func (b *builder) exprN(fn *Function, e ast.Expr) Value {
 		// cases for single-valued CallExpr.
 		var c Call
 		b.setCall(fn, e, &c.Call)
-		c.typ = fn.Pkg.typeOf(e)
+		c.typ = typ
 		return fn.emit(&c)
 
 	case *ast.IndexExpr:
 		mapt := fn.Pkg.typeOf(e.X).Underlying().(*types.Map)
-		typ = mapt.Elem()
 		lookup := &Lookup{
 			X:       b.expr(fn, e.X),
 			Index:   emitConv(fn, b.expr(fn, e.Index), mapt.Key()),
 			CommaOk: true,
 		}
+		lookup.setType(typ)
 		lookup.setPos(e.Lbrack)
-		tuple = fn.emit(lookup)
+		return fn.emit(lookup)
 
 	case *ast.TypeAssertExpr:
-		t := fn.Pkg.typeOf(e).(*types.Tuple).At(0).Type()
+		return emitTypeTest(fn, b.expr(fn, e.X), typ.At(0).Type(), e.Lparen)
-		return emitTypeTest(fn, b.expr(fn, e.X), t, e.Lparen)
 
 	case *ast.UnaryExpr: // must be receive <-
-		typ = fn.Pkg.typeOf(e.X).Underlying().(*types.Chan).Elem()
 		unop := &UnOp{
 			Op:      token.ARROW,
 			X:       b.expr(fn, e.X),
 			CommaOk: true,
 		}
+		unop.setType(typ)
 		unop.setPos(e.OpPos)
-		tuple = fn.emit(unop)
+		return fn.emit(unop)
-
-	default:
-		panic(fmt.Sprintf("unexpected exprN: %T", e))
 	}
-
+	panic(fmt.Sprintf("exprN(%T) in %s", e, fn))
-	// The typechecker sets the type of the expression to just the
-	// asserted type in the "value, ok" form, not to *types.Tuple
-	// (though it includes the valueOk operand in its error messages).
-
-	tuple.(interface {
-		setType(types.Type)
-	}).setType(types.NewTuple(
-		newVar("value", typ),
-		varOk,
-	))
-	return tuple
 }
 
 // builtin emits to fn SSA instructions to implement a call to the
@@ -1133,8 +1117,8 @@ func (b *builder) compLit(fn *Function, addr Value, e *ast.CompositeLit) {
 //
 func (b *builder) switchStmt(fn *Function, s *ast.SwitchStmt, label *lblock) {
 	// We treat SwitchStmt like a sequential if-else chain.
-	// More efficient strategies (e.g. multiway dispatch)
+	// Multiway dispatch can be recovered later by ssautil.Switches()
-	// are possible if all cases are free of side effects.
+	// to those cases that are free of side effects.
 	if s.Init != nil {
 		b.stmt(fn, s.Init)
 	}
@@ -1180,7 +1164,7 @@ func (b *builder) switchStmt(fn *Function, s *ast.SwitchStmt, label *lblock) {
 		for _, cond := range cc.List {
 			nextCond = fn.newBasicBlock("switch.next")
 			// TODO(adonovan): opt: when tag==vTrue, we'd
-			// get better much code if we use b.cond(cond)
+			// get better code if we use b.cond(cond)
 			// instead of BinOp(EQL, tag, b.expr(cond))
 			// followed by If.  Don't forget conversions
 			// though.
@@ -1218,9 +1202,8 @@ func (b *builder) switchStmt(fn *Function, s *ast.SwitchStmt, label *lblock) {
 // labelled by label.
 //
 func (b *builder) typeSwitchStmt(fn *Function, s *ast.TypeSwitchStmt, label *lblock) {
-	// We treat TypeSwitchStmt like a sequential if-else
+	// We treat TypeSwitchStmt like a sequential if-else chain.
-	// chain.  More efficient strategies (e.g. multiway
+	// Multiway dispatch can be recovered later by ssautil.Switches().
-	// dispatch) are possible.
 
 	// Typeswitch lowering:
 	//

go/ssa/interp/testdata/mrvchain.go

@@ -47,6 +47,13 @@ func h() (i interface{}, ok bool) {
 	return
 }
 
+func h2() (i interface{}, ok bool) {
+	ch := make(chan string, 1)
+	ch <- "hi"
+	i, ok = <-ch // string->interface{} conversion within multi-valued expression
+	return
+}
+
 func main() {
 	f1v(g())
 	f2(g())
@@ -61,4 +68,8 @@ func main() {
 	if !ok || i.(string) != "hi" {
 		panic(i)
 	}
+	i, ok = h2()
+	if !ok || i.(string) != "hi" {
+		panic(i)
+	}
 }