From: Michael Fraenkel <michael.fraenkel@gmail.com>
Date: Thu, 15 Feb 2018 17:28:48 +0000 (-0500)
Subject: cmd/compile: convert untyped bool for OIF and OFOR
X-Git-Tag: go1.11beta1~1603
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e057680542bd5a31a024ec1f321c439571086d42;p=gostls13.git

cmd/compile: convert untyped bool for OIF and OFOR

Updates #23834.

Change-Id: I92aca9108590a0c7de774f4fad7ded97105e3cb8
Reviewed-on: https://go-review.googlesource.com/94475
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go
index 0161f26890..7f1a702b35 100644
--- a/src/cmd/compile/internal/gc/typecheck.go
+++ b/src/cmd/compile/internal/gc/typecheck.go
@@ -2027,6 +2027,7 @@ func typecheck1(n *Node, top int) *Node {
 		typecheckslice(n.Ninit.Slice(), Etop)
 		decldepth++
 		n.Left = typecheck(n.Left, Erv)
+		n.Left = defaultlit(n.Left, nil)
 		if n.Left != nil {
 			t := n.Left.Type
 			if t != nil && !t.IsBoolean() {
@@ -2041,6 +2042,7 @@ func typecheck1(n *Node, top int) *Node {
 		ok |= Etop
 		typecheckslice(n.Ninit.Slice(), Etop)
 		n.Left = typecheck(n.Left, Erv)
+		n.Left = defaultlit(n.Left, nil)
 		if n.Left != nil {
 			t := n.Left.Type
 			if t != nil && !t.IsBoolean() {