[dev.cc] cmd/internal/obj, cmd/internal/gc, new6g: reconvert
Reconvert using rsc.io/c2go rev 27b3f59.
Changes to converter:
- fatal does not return, so no fallthrough after fatal in switch
- many more function results and variables identified as bool
- simplification of negated boolean expressions
Change-Id: I3bc67da5e46cb7ee613e230cf7e9533036cc870b
Reviewed-on: https://go-review.googlesource.com/5171
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
diff --git a/src/cmd/internal/gc/range.go b/src/cmd/internal/gc/range.go
index 1e33da3..bb30bcf 100644
--- a/src/cmd/internal/gc/range.go
+++ b/src/cmd/internal/gc/range.go
@@ -43,7 +43,7 @@
}
}
- if Isptr[t.Etype] != 0 && Isfixedarray(t.Type) != 0 {
+ if Isptr[t.Etype] != 0 && Isfixedarray(t.Type) {
t = t.Type
}
n.Type = t
@@ -63,7 +63,7 @@
t2 = t.Type
case TCHAN:
- if !(t.Chan&Crecv != 0) {
+ if t.Chan&Crecv == 0 {
Yyerror("invalid operation: range %v (receive from send-only type %v)", Nconv(n.Right, 0), Tconv(n.Right.Type, 0))
goto out
}
@@ -184,7 +184,6 @@
switch t.Etype {
default:
Fatal("walkrange")
- fallthrough
// Lower n into runtime·memclr if possible, for
// fast zeroing of slices and arrays (issue 5373).
@@ -196,8 +195,8 @@
//
// in which the evaluation of a is side-effect-free.
case TARRAY:
- if !(Debug['N'] != 0) {
- if !(flag_race != 0) {
+ if Debug['N'] == 0 {
+ if flag_race == 0 {
if v1 != nil {
if v2 == nil {
if n.Nbody != nil {
@@ -206,10 +205,10 @@
tmp = n.Nbody.N // first statement of body
if tmp.Op == OAS {
if tmp.Left.Op == OINDEX {
- if samesafeexpr(tmp.Left.Left, a) != 0 {
- if samesafeexpr(tmp.Left.Right, v1) != 0 {
+ if samesafeexpr(tmp.Left.Left, a) {
+ if samesafeexpr(tmp.Left.Right, v1) {
if t.Type.Width > 0 {
- if iszero(tmp.Right) != 0 {
+ if iszero(tmp.Right) {
// Convert to
// if len(a) != 0 {
// hp = &a[0]
@@ -227,7 +226,7 @@
hp = temp(Ptrto(Types[TUINT8]))
tmp = Nod(OINDEX, a, Nodintconst(0))
- tmp.Bounded = 1
+ tmp.Bounded = true
tmp = Nod(OADDR, tmp, nil)
tmp = Nod(OCONVNOP, tmp, nil)
tmp.Type = Ptrto(Types[TUINT8])
@@ -282,7 +281,7 @@
if v2 != nil {
hp = temp(Ptrto(n.Type.Type))
tmp = Nod(OINDEX, ha, Nodintconst(0))
- tmp.Bounded = 1
+ tmp.Bounded = true
init = list(init, Nod(OAS, hp, Nod(OADDR, tmp, nil)))
}
@@ -369,7 +368,7 @@
}
hb = temp(Types[TBOOL])
- n.Ntest = Nod(ONE, hb, Nodbool(0))
+ n.Ntest = Nod(ONE, hb, Nodbool(false))
a = Nod(OAS2RECV, nil, nil)
a.Typecheck = 1
a.List = list(list1(hv1), hb)
