diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2016-03-01 00:15:27 -0800 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2016-03-01 08:50:45 +0000 |
| commit | ac006ad1034b6552e97fcc5f3400810380e245c8 (patch) | |
| tree | c6bd15f833fb8e71ae53fa20785a38ec764c46c7 /src | |
| parent | 33c0ef2de3ba30a70b20433b14c45ccb06d02222 (diff) | |
| download | go-ac006ad1034b6552e97fcc5f3400810380e245c8.tar.xz | |
cmd/compile: change defaultlit2's force param to bool
Change-Id: I5546c4e8092ef61648cdae9c04288bb7d6f32476
Reviewed-on: https://go-review.googlesource.com/20084
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/compile/internal/gc/const.go | 5 | ||||
| -rw-r--r-- | src/cmd/compile/internal/gc/typecheck.go | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/cmd/compile/internal/gc/const.go b/src/cmd/compile/internal/gc/const.go index 6bcf9dddd3..059f832fa7 100644 --- a/src/cmd/compile/internal/gc/const.go +++ b/src/cmd/compile/internal/gc/const.go @@ -1349,7 +1349,7 @@ num: // if they're both ideal going in they better // get the same type going out. // force means must assign concrete (non-ideal) type. -func defaultlit2(lp **Node, rp **Node, force int) { +func defaultlit2(lp **Node, rp **Node, force bool) { l := *lp r := *rp if l.Type == nil || r.Type == nil { @@ -1365,9 +1365,10 @@ func defaultlit2(lp **Node, rp **Node, force int) { return } - if force == 0 { + if !force { return } + if l.Type.Etype == TBOOL { Convlit(lp, Types[TBOOL]) Convlit(rp, Types[TBOOL]) diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go index 328859982a..102235f94e 100644 --- a/src/cmd/compile/internal/gc/typecheck.go +++ b/src/cmd/compile/internal/gc/typecheck.go @@ -567,7 +567,7 @@ OpSwitch: } // ideal mixed with non-ideal - defaultlit2(&l, &r, 0) + defaultlit2(&l, &r, false) n.Left = l n.Right = r @@ -640,7 +640,7 @@ OpSwitch: } if t.Etype != TIDEAL && !Eqtype(l.Type, r.Type) { - defaultlit2(&l, &r, 1) + defaultlit2(&l, &r, true) if n.Op == OASOP && n.Implicit { Yyerror("invalid operation: %v (non-numeric type %v)", n, l.Type) n.Type = nil @@ -698,7 +698,7 @@ OpSwitch: evconst(n) t = idealbool if n.Op != OLITERAL { - defaultlit2(&l, &r, 1) + defaultlit2(&l, &r, true) n.Left = l n.Right = r } @@ -1484,7 +1484,7 @@ OpSwitch: n.Type = nil return } - defaultlit2(&l, &r, 0) + defaultlit2(&l, &r, false) if l.Type == nil || r.Type == nil { n.Type = nil return |