[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/gen.go b/src/cmd/internal/gc/gen.go
index a40a347..9d41b6f 100644
--- a/src/cmd/internal/gc/gen.go
+++ b/src/cmd/internal/gc/gen.go
@@ -109,7 +109,7 @@
// is always a heap pointer anyway.
case ODOT,
OINDEX:
- if !(Isslice(n.Left.Type) != 0) {
+ if !Isslice(n.Left.Type) {
addrescapes(n.Left)
}
}
@@ -253,7 +253,6 @@
switch n.Left.Op {
default:
Fatal("cgen_proc: unknown call %v", Oconv(int(n.Left.Op), 0))
- fallthrough
case OCALLMETH:
Cgen_callmeth(n.Left, proc)
@@ -280,7 +279,7 @@
Fatal("cgen_dcl")
}
- if !(n.Class&PHEAP != 0) {
+ if n.Class&PHEAP == 0 {
return
}
if compiling_runtime != 0 {
@@ -304,7 +303,7 @@
switch nr.Op {
case ONAME:
- if !(nr.Class&PHEAP != 0) && nr.Class != PEXTERN && nr.Class != PFUNC && nr.Class != PPARAMREF {
+ if nr.Class&PHEAP == 0 && nr.Class != PEXTERN && nr.Class != PFUNC && nr.Class != PPARAMREF {
gused(nr)
}
@@ -480,7 +479,7 @@
tmpcap = tmplen
}
- if isnil(n.Left) != 0 {
+ if isnil(n.Left) {
Tempname(&src, n.Left.Type)
Thearch.Cgen(n.Left, &src)
} else {
@@ -491,7 +490,7 @@
}
if n.Op == OSLICEARR || n.Op == OSLICE3ARR {
- if !(Isptr[n.Left.Type.Etype] != 0) {
+ if Isptr[n.Left.Type.Etype] == 0 {
Fatal("slicearr is supposed to work on pointer: %v\n", Nconv(n, obj.FmtSign))
}
Thearch.Cgen(&src, base)
@@ -668,13 +667,12 @@
var p2 *obj.Prog
var p3 *obj.Prog
var lab *Label
- var wasregalloc int32
//dump("gen", n);
lno = setlineno(n)
- wasregalloc = int32(Thearch.Anyregalloc())
+ wasregalloc := Thearch.Anyregalloc()
if n == nil {
goto ret
@@ -879,7 +877,7 @@
cgen_dcl(n.Left)
case OAS:
- if gen_as_init(n) != 0 {
+ if gen_as_init(n) {
break
}
Cgen_as(n.Left, n.Right)
@@ -911,7 +909,7 @@
}
ret:
- if int32(Thearch.Anyregalloc()) != wasregalloc {
+ if Thearch.Anyregalloc() != wasregalloc {
Dump("node", n)
Fatal("registers left allocated")
}
@@ -936,7 +934,7 @@
return
}
- if nr == nil || iszero(nr) != 0 {
+ if nr == nil || iszero(nr) {
// heaps should already be clear
if nr == nil && (nl.Class&PHEAP != 0) {
return
@@ -946,7 +944,7 @@
if tl == nil {
return
}
- if Isfat(tl) != 0 {
+ if Isfat(tl) {
if nl.Op == ONAME {
Gvardef(nl)
}
@@ -1002,7 +1000,7 @@
continue
}
- if lab.Use == nil && !(lab.Used != 0) {
+ if lab.Use == nil && lab.Used == 0 {
yyerrorl(int(lab.Def.Lineno), "label %v defined and not used", Sconv(lab.Sym, 0))
continue
}