2015-02-13 14:40:36 -05:00
|
|
|
// Copyright 2011 The Go Authors. All rights reserved.
|
|
|
|
|
// Use of this source code is governed by a BSD-style
|
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
|
|
package gc
|
|
|
|
|
|
|
|
|
|
import (
|
2015-03-12 18:45:30 -04:00
|
|
|
"bytes"
|
2015-02-13 14:40:36 -05:00
|
|
|
"cmd/internal/obj"
|
|
|
|
|
"fmt"
|
2015-03-12 18:45:30 -04:00
|
|
|
"strconv"
|
2015-02-13 14:40:36 -05:00
|
|
|
"strings"
|
|
|
|
|
"unicode/utf8"
|
|
|
|
|
)
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
// A FmtFlag value is a set of flags (or 0).
|
|
|
|
|
// They control how the Xconv functions format their values.
|
|
|
|
|
// See the respective function's documentation for details.
|
|
|
|
|
type FmtFlag int
|
|
|
|
|
|
|
|
|
|
const (
|
|
|
|
|
FmtWidth FmtFlag = 1 << iota
|
|
|
|
|
FmtLeft // "-"
|
|
|
|
|
FmtSharp // "#"
|
|
|
|
|
FmtSign // "+"
|
|
|
|
|
FmtUnsigned // "u"
|
|
|
|
|
FmtShort // "h"
|
|
|
|
|
FmtLong // "l"
|
|
|
|
|
FmtComma // ","
|
|
|
|
|
FmtByte // "hh"
|
|
|
|
|
FmtBody // for printing export bodies
|
|
|
|
|
)
|
|
|
|
|
|
2015-02-13 14:40:36 -05:00
|
|
|
//
|
|
|
|
|
// Format conversions
|
|
|
|
|
// %L int Line numbers
|
|
|
|
|
//
|
|
|
|
|
// %E int etype values (aka 'Kind')
|
|
|
|
|
//
|
|
|
|
|
// %O int Node Opcodes
|
|
|
|
|
// Flags: "%#O": print go syntax. (automatic unless fmtmode == FDbg)
|
|
|
|
|
//
|
|
|
|
|
// %J Node* Node details
|
|
|
|
|
// Flags: "%hJ" suppresses things not relevant until walk.
|
|
|
|
|
//
|
|
|
|
|
// %V Val* Constant values
|
|
|
|
|
//
|
|
|
|
|
// %S Sym* Symbols
|
|
|
|
|
// Flags: +,- #: mode (see below)
|
|
|
|
|
// "%hS" unqualified identifier in any mode
|
|
|
|
|
// "%hhS" in export mode: unqualified identifier if exported, qualified if not
|
|
|
|
|
//
|
|
|
|
|
// %T Type* Types
|
|
|
|
|
// Flags: +,- #: mode (see below)
|
|
|
|
|
// 'l' definition instead of name.
|
|
|
|
|
// 'h' omit "func" and receiver in function types
|
|
|
|
|
// 'u' (only in -/Sym mode) print type identifiers wit package name instead of prefix.
|
|
|
|
|
//
|
|
|
|
|
// %N Node* Nodes
|
|
|
|
|
// Flags: +,- #: mode (see below)
|
|
|
|
|
// 'h' (only in +/debug mode) suppress recursion
|
|
|
|
|
// 'l' (only in Error mode) print "foo (type Bar)"
|
|
|
|
|
//
|
2016-03-10 10:00:29 -08:00
|
|
|
// %H Nodes Nodes
|
2015-02-13 14:40:36 -05:00
|
|
|
// Flags: those of %N
|
|
|
|
|
// ',' separate items with ',' instead of ';'
|
|
|
|
|
//
|
2015-10-22 09:51:12 +09:00
|
|
|
// In mparith2.go and mparith3.go:
|
|
|
|
|
// %B Mpint* Big integers
|
|
|
|
|
// %F Mpflt* Big floats
|
2015-02-13 14:40:36 -05:00
|
|
|
//
|
|
|
|
|
// %S, %T and %N obey use the following flags to set the format mode:
|
|
|
|
|
const (
|
|
|
|
|
FErr = iota
|
|
|
|
|
FDbg
|
2016-08-16 12:55:17 -07:00
|
|
|
_ // formerly FExp - leave gap for now just in case there's some hard-wired dependency on the const value
|
2015-02-13 14:40:36 -05:00
|
|
|
FTypeId
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
var fmtmode int = FErr
|
|
|
|
|
|
|
|
|
|
var fmtpkgpfx int // %uT stickyness
|
|
|
|
|
|
2015-12-30 19:47:36 -05:00
|
|
|
var fmtbody bool
|
|
|
|
|
|
2015-02-13 14:40:36 -05:00
|
|
|
//
|
|
|
|
|
// E.g. for %S: %+S %#S %-S print an identifier properly qualified for debug/export/internal mode.
|
|
|
|
|
//
|
|
|
|
|
// The mode flags +, - and # are sticky, meaning they persist through
|
2016-03-01 23:21:55 +00:00
|
|
|
// recursions of %N, %T and %S, but not the h and l flags. The u flag is
|
2015-02-13 14:40:36 -05:00
|
|
|
// sticky only on %T recursions and only used in %-/Sym mode.
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// Useful format combinations:
|
|
|
|
|
//
|
|
|
|
|
// %+N %+H multiline recursive debug dump of node/nodelist
|
|
|
|
|
// %+hN %+hH non recursive debug dump
|
|
|
|
|
//
|
|
|
|
|
// %#N %#T export format
|
|
|
|
|
// %#lT type definition instead of name
|
|
|
|
|
// %#hT omit"func" and receiver in function signature
|
|
|
|
|
//
|
|
|
|
|
// %lN "foo (type Bar)" for error messages
|
|
|
|
|
//
|
|
|
|
|
// %-T type identifiers
|
|
|
|
|
// %-hT type identifiers without "func" and arg names in type signatures (methodsym)
|
|
|
|
|
// %-uT type identifiers with package name instead of prefix (typesym, dcommontype, typehash)
|
|
|
|
|
//
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
func setfmode(flags *FmtFlag) (fm int, fb bool) {
|
2015-12-30 19:47:36 -05:00
|
|
|
fm = fmtmode
|
|
|
|
|
fb = fmtbody
|
2016-03-15 13:06:58 -07:00
|
|
|
if *flags&FmtSign != 0 {
|
2015-02-13 14:40:36 -05:00
|
|
|
fmtmode = FDbg
|
2016-03-15 13:06:58 -07:00
|
|
|
} else if *flags&FmtSharp != 0 {
|
2016-08-16 12:55:17 -07:00
|
|
|
// for textual export format - no longer supported
|
|
|
|
|
Fatalf("textual export format request")
|
2016-03-15 13:06:58 -07:00
|
|
|
} else if *flags&FmtLeft != 0 {
|
2015-02-13 14:40:36 -05:00
|
|
|
fmtmode = FTypeId
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
if *flags&FmtBody != 0 {
|
2015-12-30 19:47:36 -05:00
|
|
|
fmtbody = true
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
*flags &^= (FmtSharp | FmtLeft | FmtSign | FmtBody)
|
2015-12-30 19:47:36 -05:00
|
|
|
return
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Fmt "%L": Linenumbers
|
|
|
|
|
|
|
|
|
|
var goopnames = []string{
|
|
|
|
|
OADDR: "&",
|
|
|
|
|
OADD: "+",
|
|
|
|
|
OADDSTR: "+",
|
|
|
|
|
OANDAND: "&&",
|
|
|
|
|
OANDNOT: "&^",
|
|
|
|
|
OAND: "&",
|
|
|
|
|
OAPPEND: "append",
|
|
|
|
|
OAS: "=",
|
|
|
|
|
OAS2: "=",
|
|
|
|
|
OBREAK: "break",
|
|
|
|
|
OCALL: "function call", // not actual syntax
|
|
|
|
|
OCAP: "cap",
|
|
|
|
|
OCASE: "case",
|
|
|
|
|
OCLOSE: "close",
|
|
|
|
|
OCOMPLEX: "complex",
|
|
|
|
|
OCOM: "^",
|
|
|
|
|
OCONTINUE: "continue",
|
|
|
|
|
OCOPY: "copy",
|
|
|
|
|
ODEC: "--",
|
|
|
|
|
ODELETE: "delete",
|
|
|
|
|
ODEFER: "defer",
|
|
|
|
|
ODIV: "/",
|
|
|
|
|
OEQ: "==",
|
|
|
|
|
OFALL: "fallthrough",
|
|
|
|
|
OFOR: "for",
|
|
|
|
|
OGE: ">=",
|
|
|
|
|
OGOTO: "goto",
|
|
|
|
|
OGT: ">",
|
|
|
|
|
OIF: "if",
|
|
|
|
|
OIMAG: "imag",
|
|
|
|
|
OINC: "++",
|
|
|
|
|
OIND: "*",
|
|
|
|
|
OLEN: "len",
|
|
|
|
|
OLE: "<=",
|
|
|
|
|
OLSH: "<<",
|
|
|
|
|
OLT: "<",
|
|
|
|
|
OMAKE: "make",
|
|
|
|
|
OMINUS: "-",
|
|
|
|
|
OMOD: "%",
|
|
|
|
|
OMUL: "*",
|
|
|
|
|
ONEW: "new",
|
|
|
|
|
ONE: "!=",
|
|
|
|
|
ONOT: "!",
|
|
|
|
|
OOROR: "||",
|
|
|
|
|
OOR: "|",
|
|
|
|
|
OPANIC: "panic",
|
|
|
|
|
OPLUS: "+",
|
|
|
|
|
OPRINTN: "println",
|
|
|
|
|
OPRINT: "print",
|
|
|
|
|
ORANGE: "range",
|
|
|
|
|
OREAL: "real",
|
|
|
|
|
ORECV: "<-",
|
|
|
|
|
ORECOVER: "recover",
|
|
|
|
|
ORETURN: "return",
|
|
|
|
|
ORSH: ">>",
|
|
|
|
|
OSELECT: "select",
|
|
|
|
|
OSEND: "<-",
|
|
|
|
|
OSUB: "-",
|
|
|
|
|
OSWITCH: "switch",
|
|
|
|
|
OXOR: "^",
|
2016-04-01 23:28:14 -05:00
|
|
|
OXFALL: "fallthrough",
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-04-27 19:34:17 +10:00
|
|
|
func (o Op) String() string {
|
|
|
|
|
return oconv(o, 0)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (o Op) GoString() string {
|
|
|
|
|
return oconv(o, FmtSharp)
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-27 14:46:09 +10:00
|
|
|
func oconv(o Op, flag FmtFlag) string {
|
2016-03-15 13:06:58 -07:00
|
|
|
if (flag&FmtSharp != 0) || fmtmode != FDbg {
|
2016-03-07 08:23:55 -08:00
|
|
|
if o >= 0 && int(o) < len(goopnames) && goopnames[o] != "" {
|
2015-02-27 22:44:15 +00:00
|
|
|
return goopnames[o]
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-07 08:23:55 -08:00
|
|
|
if o >= 0 && int(o) < len(opnames) && opnames[o] != "" {
|
2015-02-27 22:44:15 +00:00
|
|
|
return opnames[o]
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-27 22:44:15 +00:00
|
|
|
return fmt.Sprintf("O-%d", o)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var classnames = []string{
|
|
|
|
|
"Pxxx",
|
|
|
|
|
"PEXTERN",
|
|
|
|
|
"PAUTO",
|
cmd/compile: fix liveness computation for heap-escaped parameters
The liveness computation of parameters generally was never
correct, but forcing all parameters to be live throughout the
function covered up that problem. The new SSA back end is
too clever: even though it currently keeps the parameter values live
throughout the function, it may find optimizations that mean
the current values are not written back to the original parameter
stack slots immediately or ever (for example if a parameter is set
to nil, SSA constant propagation may replace all later uses of the
parameter with a constant nil, eliminating the need to write the nil
value back to the stack slot), so the liveness code must now
track the actual operations on the stack slots, exposing these
problems.
One small problem in the handling of arguments is that nodarg
can return ONAME PPARAM nodes with adjusted offsets, so that
there are actually multiple *Node pointers for the same parameter
in the instruction stream. This might be possible to correct, but
not in this CL. For now, we fix this by using n.Orig instead of n
when considering PPARAM and PPARAMOUT nodes.
The major problem in the handling of arguments is general
confusion in the liveness code about the meaning of PPARAM|PHEAP
and PPARAMOUT|PHEAP nodes, especially as contrasted with PAUTO|PHEAP.
The difference between these two is that when a local variable "moves"
to the heap, it's really just allocated there to start with; in contrast,
when an argument moves to the heap, the actual data has to be copied
there from the stack at the beginning of the function, and when a
result "moves" to the heap the value in the heap has to be copied
back to the stack when the function returns
This general confusion is also present in the SSA back end.
The PHEAP bit worked decently when I first introduced it 7 years ago (!)
in 391425ae. The back end did nothing sophisticated, and in particular
there was no analysis at all: no escape analysis, no liveness analysis,
and certainly no SSA back end. But the complications caused in the
various downstream consumers suggest that this should be a detail
kept mainly in the front end.
This CL therefore eliminates both the PHEAP bit and even the idea of
"heap variables" from the back ends.
First, it replaces the PPARAM|PHEAP, PPARAMOUT|PHEAP, and PAUTO|PHEAP
variable classes with the single PAUTOHEAP, a pseudo-class indicating
a variable maintained on the heap and available by indirecting a
local variable kept on the stack (a plain PAUTO).
Second, walkexpr replaces all references to PAUTOHEAP variables
with indirections of the corresponding PAUTO variable.
The back ends and the liveness code now just see plain indirected
variables. This may actually produce better code, but the real goal
here is to eliminate these little-used and somewhat suspect code
paths in the back end analyses.
The OPARAM node type goes away too.
A followup CL will do the same to PPARAMREF. I'm not sure that
the back ends (SSA in particular) are handling those right either,
and with the framework established in this CL that change is trivial
and the result clearly more correct.
Fixes #15747.
Change-Id: I2770b1ce3cbc93981bfc7166be66a9da12013d74
Reviewed-on: https://go-review.googlesource.com/23393
Reviewed-by: Keith Randall <khr@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-05-25 01:33:24 -04:00
|
|
|
"PAUTOHEAP",
|
2015-02-13 14:40:36 -05:00
|
|
|
"PPARAM",
|
|
|
|
|
"PPARAMOUT",
|
|
|
|
|
"PFUNC",
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Fmt "%J": Node details.
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
func jconv(n *Node, flag FmtFlag) string {
|
2015-03-12 18:45:30 -04:00
|
|
|
var buf bytes.Buffer
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
c := flag & FmtShort
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if c == 0 && n.Ullman != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " u(%d)", n.Ullman)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-04-02 19:58:37 -07:00
|
|
|
if c == 0 && n.Addable {
|
2015-04-17 01:50:16 -04:00
|
|
|
fmt.Fprintf(&buf, " a(%v)", n.Addable)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-05-26 23:56:14 -04:00
|
|
|
if c == 0 && n.Name != nil && n.Name.Vargen != 0 {
|
|
|
|
|
fmt.Fprintf(&buf, " g(%d)", n.Name.Vargen)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if n.Lineno != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " l(%d)", n.Lineno)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if c == 0 && n.Xoffset != BADWIDTH {
|
2015-05-26 21:30:20 -04:00
|
|
|
fmt.Fprintf(&buf, " x(%d%+d)", n.Xoffset, stkdelta[n])
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if n.Class != 0 {
|
cmd/compile: fix liveness computation for heap-escaped parameters
The liveness computation of parameters generally was never
correct, but forcing all parameters to be live throughout the
function covered up that problem. The new SSA back end is
too clever: even though it currently keeps the parameter values live
throughout the function, it may find optimizations that mean
the current values are not written back to the original parameter
stack slots immediately or ever (for example if a parameter is set
to nil, SSA constant propagation may replace all later uses of the
parameter with a constant nil, eliminating the need to write the nil
value back to the stack slot), so the liveness code must now
track the actual operations on the stack slots, exposing these
problems.
One small problem in the handling of arguments is that nodarg
can return ONAME PPARAM nodes with adjusted offsets, so that
there are actually multiple *Node pointers for the same parameter
in the instruction stream. This might be possible to correct, but
not in this CL. For now, we fix this by using n.Orig instead of n
when considering PPARAM and PPARAMOUT nodes.
The major problem in the handling of arguments is general
confusion in the liveness code about the meaning of PPARAM|PHEAP
and PPARAMOUT|PHEAP nodes, especially as contrasted with PAUTO|PHEAP.
The difference between these two is that when a local variable "moves"
to the heap, it's really just allocated there to start with; in contrast,
when an argument moves to the heap, the actual data has to be copied
there from the stack at the beginning of the function, and when a
result "moves" to the heap the value in the heap has to be copied
back to the stack when the function returns
This general confusion is also present in the SSA back end.
The PHEAP bit worked decently when I first introduced it 7 years ago (!)
in 391425ae. The back end did nothing sophisticated, and in particular
there was no analysis at all: no escape analysis, no liveness analysis,
and certainly no SSA back end. But the complications caused in the
various downstream consumers suggest that this should be a detail
kept mainly in the front end.
This CL therefore eliminates both the PHEAP bit and even the idea of
"heap variables" from the back ends.
First, it replaces the PPARAM|PHEAP, PPARAMOUT|PHEAP, and PAUTO|PHEAP
variable classes with the single PAUTOHEAP, a pseudo-class indicating
a variable maintained on the heap and available by indirecting a
local variable kept on the stack (a plain PAUTO).
Second, walkexpr replaces all references to PAUTOHEAP variables
with indirections of the corresponding PAUTO variable.
The back ends and the liveness code now just see plain indirected
variables. This may actually produce better code, but the real goal
here is to eliminate these little-used and somewhat suspect code
paths in the back end analyses.
The OPARAM node type goes away too.
A followup CL will do the same to PPARAMREF. I'm not sure that
the back ends (SSA in particular) are handling those right either,
and with the framework established in this CL that change is trivial
and the result clearly more correct.
Fixes #15747.
Change-Id: I2770b1ce3cbc93981bfc7166be66a9da12013d74
Reviewed-on: https://go-review.googlesource.com/23393
Reviewed-by: Keith Randall <khr@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-05-25 01:33:24 -04:00
|
|
|
if int(n.Class) < len(classnames) {
|
|
|
|
|
fmt.Fprintf(&buf, " class(%s)", classnames[n.Class])
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
cmd/compile: fix liveness computation for heap-escaped parameters
The liveness computation of parameters generally was never
correct, but forcing all parameters to be live throughout the
function covered up that problem. The new SSA back end is
too clever: even though it currently keeps the parameter values live
throughout the function, it may find optimizations that mean
the current values are not written back to the original parameter
stack slots immediately or ever (for example if a parameter is set
to nil, SSA constant propagation may replace all later uses of the
parameter with a constant nil, eliminating the need to write the nil
value back to the stack slot), so the liveness code must now
track the actual operations on the stack slots, exposing these
problems.
One small problem in the handling of arguments is that nodarg
can return ONAME PPARAM nodes with adjusted offsets, so that
there are actually multiple *Node pointers for the same parameter
in the instruction stream. This might be possible to correct, but
not in this CL. For now, we fix this by using n.Orig instead of n
when considering PPARAM and PPARAMOUT nodes.
The major problem in the handling of arguments is general
confusion in the liveness code about the meaning of PPARAM|PHEAP
and PPARAMOUT|PHEAP nodes, especially as contrasted with PAUTO|PHEAP.
The difference between these two is that when a local variable "moves"
to the heap, it's really just allocated there to start with; in contrast,
when an argument moves to the heap, the actual data has to be copied
there from the stack at the beginning of the function, and when a
result "moves" to the heap the value in the heap has to be copied
back to the stack when the function returns
This general confusion is also present in the SSA back end.
The PHEAP bit worked decently when I first introduced it 7 years ago (!)
in 391425ae. The back end did nothing sophisticated, and in particular
there was no analysis at all: no escape analysis, no liveness analysis,
and certainly no SSA back end. But the complications caused in the
various downstream consumers suggest that this should be a detail
kept mainly in the front end.
This CL therefore eliminates both the PHEAP bit and even the idea of
"heap variables" from the back ends.
First, it replaces the PPARAM|PHEAP, PPARAMOUT|PHEAP, and PAUTO|PHEAP
variable classes with the single PAUTOHEAP, a pseudo-class indicating
a variable maintained on the heap and available by indirecting a
local variable kept on the stack (a plain PAUTO).
Second, walkexpr replaces all references to PAUTOHEAP variables
with indirections of the corresponding PAUTO variable.
The back ends and the liveness code now just see plain indirected
variables. This may actually produce better code, but the real goal
here is to eliminate these little-used and somewhat suspect code
paths in the back end analyses.
The OPARAM node type goes away too.
A followup CL will do the same to PPARAMREF. I'm not sure that
the back ends (SSA in particular) are handling those right either,
and with the framework established in this CL that change is trivial
and the result clearly more correct.
Fixes #15747.
Change-Id: I2770b1ce3cbc93981bfc7166be66a9da12013d74
Reviewed-on: https://go-review.googlesource.com/23393
Reviewed-by: Keith Randall <khr@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-05-25 01:33:24 -04:00
|
|
|
fmt.Fprintf(&buf, " class(%d?)", n.Class)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-02 19:58:37 -07:00
|
|
|
if n.Colas {
|
2015-04-17 01:50:16 -04:00
|
|
|
fmt.Fprintf(&buf, " colas(%v)", n.Colas)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-05-27 00:44:05 -04:00
|
|
|
if n.Name != nil && n.Name.Funcdepth != 0 {
|
|
|
|
|
fmt.Fprintf(&buf, " f(%d)", n.Name.Funcdepth)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-06-03 14:16:01 -04:00
|
|
|
if n.Func != nil && n.Func.Depth != 0 {
|
|
|
|
|
fmt.Fprintf(&buf, " ff(%d)", n.Func.Depth)
|
|
|
|
|
}
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
switch n.Esc {
|
|
|
|
|
case EscUnknown:
|
|
|
|
|
break
|
|
|
|
|
|
|
|
|
|
case EscHeap:
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" esc(h)")
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case EscScope:
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" esc(s)")
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case EscNone:
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" esc(no)")
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case EscNever:
|
2015-02-17 22:13:49 -05:00
|
|
|
if c == 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" esc(N)")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " esc(%d)", n.Esc)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-05-27 00:47:05 -04:00
|
|
|
if e, ok := n.Opt().(*NodeEscState); ok && e.Escloopdepth != 0 {
|
2015-05-26 23:42:41 -04:00
|
|
|
fmt.Fprintf(&buf, " ld(%d)", e.Escloopdepth)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if c == 0 && n.Typecheck != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " tc(%d)", n.Typecheck)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if c == 0 && n.Dodata != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " dd(%d)", n.Dodata)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-03-09 16:24:07 +11:00
|
|
|
if n.Isddd {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " isddd(%v)", n.Isddd)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-03-06 21:18:41 +11:00
|
|
|
if n.Implicit {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " implicit(%v)", n.Implicit)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if n.Embedded != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " embedded(%d)", n.Embedded)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-03-05 18:20:54 +11:00
|
|
|
if n.Addrtaken {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" addrtaken")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-03-06 18:42:58 +11:00
|
|
|
if n.Assigned {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" assigned")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-04-19 21:06:53 -07:00
|
|
|
if n.Bounded {
|
|
|
|
|
buf.WriteString(" bounded")
|
|
|
|
|
}
|
|
|
|
|
if n.NonNil {
|
|
|
|
|
buf.WriteString(" nonnil")
|
|
|
|
|
}
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-03-06 21:18:41 +11:00
|
|
|
if c == 0 && n.Used {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmt.Fprintf(&buf, " used(%v)", n.Used)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
return buf.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Fmt "%V": Values
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
func vconv(v Val, flag FmtFlag) string {
|
2016-04-22 12:27:29 -07:00
|
|
|
switch u := v.U.(type) {
|
|
|
|
|
case *Mpint:
|
|
|
|
|
if !u.Rune {
|
2016-08-16 12:55:17 -07:00
|
|
|
if flag&FmtSharp != 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return bconv(u, FmtSharp)
|
2016-04-22 12:27:29 -07:00
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return bconv(u, 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-04-22 12:27:29 -07:00
|
|
|
x := u.Int64()
|
2016-04-10 08:48:55 +02:00
|
|
|
if ' ' <= x && x < utf8.RuneSelf && x != '\\' && x != '\'' {
|
2015-02-27 22:44:15 +00:00
|
|
|
return fmt.Sprintf("'%c'", int(x))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
if 0 <= x && x < 1<<16 {
|
2015-02-27 22:44:15 +00:00
|
|
|
return fmt.Sprintf("'\\u%04x'", uint(int(x)))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
if 0 <= x && x <= utf8.MaxRune {
|
2015-02-27 22:44:15 +00:00
|
|
|
return fmt.Sprintf("'\\U%08x'", uint64(x))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-04-22 12:27:29 -07:00
|
|
|
return fmt.Sprintf("('\\x00' + %v)", u)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-04-22 12:27:29 -07:00
|
|
|
case *Mpflt:
|
2016-08-16 12:55:17 -07:00
|
|
|
if flag&FmtSharp != 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fconv(u, 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fconv(u, FmtSharp)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-04-22 12:27:29 -07:00
|
|
|
case *Mpcplx:
|
2016-08-16 12:55:17 -07:00
|
|
|
if flag&FmtSharp != 0 {
|
2016-04-22 12:27:29 -07:00
|
|
|
return fmt.Sprintf("(%v+%vi)", &u.Real, &u.Imag)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-20 13:55:42 -07:00
|
|
|
if v.U.(*Mpcplx).Real.CmpFloat64(0) == 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("%vi", fconv(&u.Imag, FmtSharp))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-20 13:55:42 -07:00
|
|
|
if v.U.(*Mpcplx).Imag.CmpFloat64(0) == 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fconv(&u.Real, FmtSharp)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-20 13:55:42 -07:00
|
|
|
if v.U.(*Mpcplx).Imag.CmpFloat64(0) < 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("(%v%vi)", fconv(&u.Real, FmtSharp), fconv(&u.Imag, FmtSharp))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("(%v+%vi)", fconv(&u.Real, FmtSharp), fconv(&u.Imag, FmtSharp))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-04-22 12:27:29 -07:00
|
|
|
case string:
|
|
|
|
|
return strconv.Quote(u)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-04-22 12:27:29 -07:00
|
|
|
case bool:
|
|
|
|
|
if u {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "true"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
return "false"
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-04-22 12:27:29 -07:00
|
|
|
case *NilVal:
|
2015-03-12 18:45:30 -04:00
|
|
|
return "nil"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-08-28 15:38:20 -07:00
|
|
|
return fmt.Sprintf("<ctype=%d>", v.Ctype())
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
s%,%,\n%g
|
|
|
|
|
s%\n+%\n%g
|
|
|
|
|
s%^[ ]*T%%g
|
|
|
|
|
s%,.*%%g
|
|
|
|
|
s%.+% [T&] = "&",%g
|
|
|
|
|
s%^ ........*\]%&~%g
|
|
|
|
|
s%~ %%g
|
|
|
|
|
*/
|
|
|
|
|
var etnames = []string{
|
2016-03-27 15:31:50 -07:00
|
|
|
Txxx: "Txxx",
|
2015-02-13 14:40:36 -05:00
|
|
|
TINT: "INT",
|
|
|
|
|
TUINT: "UINT",
|
|
|
|
|
TINT8: "INT8",
|
|
|
|
|
TUINT8: "UINT8",
|
|
|
|
|
TINT16: "INT16",
|
|
|
|
|
TUINT16: "UINT16",
|
|
|
|
|
TINT32: "INT32",
|
|
|
|
|
TUINT32: "UINT32",
|
|
|
|
|
TINT64: "INT64",
|
|
|
|
|
TUINT64: "UINT64",
|
|
|
|
|
TUINTPTR: "UINTPTR",
|
|
|
|
|
TFLOAT32: "FLOAT32",
|
|
|
|
|
TFLOAT64: "FLOAT64",
|
|
|
|
|
TCOMPLEX64: "COMPLEX64",
|
|
|
|
|
TCOMPLEX128: "COMPLEX128",
|
|
|
|
|
TBOOL: "BOOL",
|
|
|
|
|
TPTR32: "PTR32",
|
|
|
|
|
TPTR64: "PTR64",
|
|
|
|
|
TFUNC: "FUNC",
|
|
|
|
|
TARRAY: "ARRAY",
|
2016-04-18 14:02:08 -07:00
|
|
|
TSLICE: "SLICE",
|
2015-02-13 14:40:36 -05:00
|
|
|
TSTRUCT: "STRUCT",
|
|
|
|
|
TCHAN: "CHAN",
|
|
|
|
|
TMAP: "MAP",
|
|
|
|
|
TINTER: "INTER",
|
|
|
|
|
TFORW: "FORW",
|
|
|
|
|
TSTRING: "STRING",
|
2015-07-22 19:18:35 -07:00
|
|
|
TUNSAFEPTR: "TUNSAFEPTR",
|
2015-02-13 14:40:36 -05:00
|
|
|
TANY: "ANY",
|
2016-03-27 15:31:50 -07:00
|
|
|
TIDEAL: "TIDEAL",
|
|
|
|
|
TNIL: "TNIL",
|
|
|
|
|
TBLANK: "TBLANK",
|
|
|
|
|
TFUNCARGS: "TFUNCARGS",
|
|
|
|
|
TCHANARGS: "TCHANARGS",
|
|
|
|
|
TINTERMETH: "TINTERMETH",
|
|
|
|
|
TDDDFIELD: "TDDDFIELD",
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
func (et EType) String() string {
|
2015-09-24 23:21:18 +02:00
|
|
|
if int(et) < len(etnames) && etnames[et] != "" {
|
2015-02-27 22:44:15 +00:00
|
|
|
return etnames[et]
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-02-27 22:44:15 +00:00
|
|
|
return fmt.Sprintf("E-%d", et)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Fmt "%S": syms
|
2016-03-15 13:06:58 -07:00
|
|
|
func symfmt(s *Sym, flag FmtFlag) string {
|
|
|
|
|
if s.Pkg != nil && flag&FmtShort == 0 {
|
2015-02-13 14:40:36 -05:00
|
|
|
switch fmtmode {
|
|
|
|
|
case FErr: // This is for the user
|
2016-01-19 14:17:29 -08:00
|
|
|
if s.Pkg == builtinpkg || s.Pkg == localpkg {
|
2015-02-27 22:44:15 +00:00
|
|
|
return s.Name
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If the name was used by multiple packages, display the full path,
|
2015-03-02 16:21:15 -05:00
|
|
|
if s.Pkg.Name != "" && numImport[s.Pkg.Name] > 1 {
|
2015-03-02 16:03:26 -05:00
|
|
|
return fmt.Sprintf("%q.%s", s.Pkg.Path, s.Name)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-19 16:34:48 -07:00
|
|
|
return s.Pkg.Name + "." + s.Name
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case FDbg:
|
2016-03-19 16:34:48 -07:00
|
|
|
return s.Pkg.Name + "." + s.Name
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case FTypeId:
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtUnsigned != 0 {
|
2016-03-19 16:34:48 -07:00
|
|
|
return s.Pkg.Name + "." + s.Name // dcommontype, typehash
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-19 16:34:48 -07:00
|
|
|
return s.Pkg.Prefix + "." + s.Name // (methodsym), typesym, weaksym
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtByte != 0 {
|
2015-02-27 22:44:15 +00:00
|
|
|
// FmtByte (hh) implies FmtShort (h)
|
2015-02-13 14:40:36 -05:00
|
|
|
// skip leading "type." in method name
|
2015-02-23 16:07:24 -05:00
|
|
|
p := s.Name
|
2015-02-13 14:40:36 -05:00
|
|
|
if i := strings.LastIndex(s.Name, "."); i >= 0 {
|
|
|
|
|
p = s.Name[i+1:]
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-16 12:55:17 -07:00
|
|
|
if fmtmode == FDbg {
|
2015-03-02 16:03:26 -05:00
|
|
|
return fmt.Sprintf("@%q.%s", s.Pkg.Path, p)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-27 22:44:15 +00:00
|
|
|
return p
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-27 22:44:15 +00:00
|
|
|
return s.Name
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var basicnames = []string{
|
|
|
|
|
TINT: "int",
|
|
|
|
|
TUINT: "uint",
|
|
|
|
|
TINT8: "int8",
|
|
|
|
|
TUINT8: "uint8",
|
|
|
|
|
TINT16: "int16",
|
|
|
|
|
TUINT16: "uint16",
|
|
|
|
|
TINT32: "int32",
|
|
|
|
|
TUINT32: "uint32",
|
|
|
|
|
TINT64: "int64",
|
|
|
|
|
TUINT64: "uint64",
|
|
|
|
|
TUINTPTR: "uintptr",
|
|
|
|
|
TFLOAT32: "float32",
|
|
|
|
|
TFLOAT64: "float64",
|
|
|
|
|
TCOMPLEX64: "complex64",
|
|
|
|
|
TCOMPLEX128: "complex128",
|
|
|
|
|
TBOOL: "bool",
|
|
|
|
|
TANY: "any",
|
|
|
|
|
TSTRING: "string",
|
|
|
|
|
TNIL: "nil",
|
|
|
|
|
TIDEAL: "untyped number",
|
|
|
|
|
TBLANK: "blank",
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
func typefmt(t *Type, flag FmtFlag) string {
|
2015-02-13 14:40:36 -05:00
|
|
|
if t == nil {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "<T>"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if t == bytetype || t == runetype {
|
|
|
|
|
// in %-T mode collapse rune and byte with their originals.
|
|
|
|
|
if fmtmode != FTypeId {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return sconv(t.Sym, FmtShort)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
t = Types[t.Etype]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if t == errortype {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "error"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Unless the 'l' flag was specified, if the type has a name, just print that name.
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtLong == 0 && t.Sym != nil && t != Types[t.Etype] {
|
2015-02-13 14:40:36 -05:00
|
|
|
switch fmtmode {
|
|
|
|
|
case FTypeId:
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtShort != 0 {
|
2015-02-13 14:40:36 -05:00
|
|
|
if t.Vargen != 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("%v·%d", sconv(t.Sym, FmtShort), t.Vargen)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return sconv(t.Sym, FmtShort)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtUnsigned != 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return sconv(t.Sym, FmtUnsigned)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if t.Sym.Pkg == localpkg && t.Vargen != 0 {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("%v·%d", t.Sym, t.Vargen)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return sconv(t.Sym, 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if int(t.Etype) < len(basicnames) && basicnames[t.Etype] != "" {
|
2015-03-12 18:45:30 -04:00
|
|
|
prefix := ""
|
2015-02-13 14:40:36 -05:00
|
|
|
if fmtmode == FErr && (t == idealbool || t == idealstring) {
|
2015-03-12 18:45:30 -04:00
|
|
|
prefix = "untyped "
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
return prefix + basicnames[t.Etype]
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if fmtmode == FDbg {
|
2015-03-12 18:45:30 -04:00
|
|
|
fmtmode = 0
|
2016-04-22 08:39:56 -07:00
|
|
|
str := t.Etype.String() + "-" + typefmt(t, flag)
|
2015-03-12 18:45:30 -04:00
|
|
|
fmtmode = FDbg
|
|
|
|
|
return str
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch t.Etype {
|
2015-04-01 09:38:44 -07:00
|
|
|
case TPTR32, TPTR64:
|
2016-03-15 13:06:58 -07:00
|
|
|
if fmtmode == FTypeId && (flag&FmtShort != 0) {
|
2016-03-30 10:57:47 -07:00
|
|
|
return "*" + Tconv(t.Elem(), FmtShort)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-30 10:57:47 -07:00
|
|
|
return "*" + t.Elem().String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case TARRAY:
|
2016-03-27 17:57:42 -07:00
|
|
|
if t.isDDDArray() {
|
2016-03-30 10:57:47 -07:00
|
|
|
return "[...]" + t.Elem().String()
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-04-18 14:02:08 -07:00
|
|
|
return fmt.Sprintf("[%d]%v", t.NumElem(), t.Elem())
|
|
|
|
|
|
|
|
|
|
case TSLICE:
|
2016-03-30 10:57:47 -07:00
|
|
|
return "[]" + t.Elem().String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case TCHAN:
|
2016-04-02 16:26:30 -07:00
|
|
|
switch t.ChanDir() {
|
2015-02-13 14:40:36 -05:00
|
|
|
case Crecv:
|
2016-03-30 10:57:47 -07:00
|
|
|
return "<-chan " + t.Elem().String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case Csend:
|
2016-03-30 10:57:47 -07:00
|
|
|
return "chan<- " + t.Elem().String()
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-04-02 16:26:30 -07:00
|
|
|
if t.Elem() != nil && t.Elem().IsChan() && t.Elem().Sym == nil && t.Elem().ChanDir() == Crecv {
|
2016-03-30 10:57:47 -07:00
|
|
|
return "chan (" + t.Elem().String() + ")"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-30 10:57:47 -07:00
|
|
|
return "chan " + t.Elem().String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case TMAP:
|
2016-03-28 21:48:47 -07:00
|
|
|
return "map[" + t.Key().String() + "]" + t.Val().String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case TINTER:
|
2015-03-12 18:45:30 -04:00
|
|
|
var buf bytes.Buffer
|
|
|
|
|
buf.WriteString("interface {")
|
2016-03-17 00:44:07 -07:00
|
|
|
for i, f := range t.Fields().Slice() {
|
|
|
|
|
if i != 0 {
|
|
|
|
|
buf.WriteString(";")
|
|
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" ")
|
2015-08-29 11:30:10 +00:00
|
|
|
switch {
|
2016-03-17 00:44:07 -07:00
|
|
|
case f.Sym == nil:
|
2015-08-29 11:30:10 +00:00
|
|
|
// Check first that a symbol is defined for this type.
|
|
|
|
|
// Wrong interface definitions may have types lacking a symbol.
|
|
|
|
|
break
|
2016-03-17 00:44:07 -07:00
|
|
|
case exportname(f.Sym.Name):
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
buf.WriteString(sconv(f.Sym, FmtShort))
|
2015-08-29 11:30:10 +00:00
|
|
|
default:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
buf.WriteString(sconv(f.Sym, FmtUnsigned))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-17 00:44:07 -07:00
|
|
|
buf.WriteString(Tconv(f.Type, FmtShort))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-17 00:44:07 -07:00
|
|
|
if t.NumFields() != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" ")
|
|
|
|
|
}
|
|
|
|
|
buf.WriteString("}")
|
|
|
|
|
return buf.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case TFUNC:
|
2015-03-12 18:45:30 -04:00
|
|
|
var buf bytes.Buffer
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtShort != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
// no leading func
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2016-03-17 01:47:16 -07:00
|
|
|
if t.Recv() != nil {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString("method")
|
2016-03-09 20:54:59 -08:00
|
|
|
buf.WriteString(Tconv(t.Recvs(), 0))
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" ")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString("func")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-08 16:31:28 -08:00
|
|
|
buf.WriteString(Tconv(t.Params(), 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-03-17 01:47:16 -07:00
|
|
|
switch t.Results().NumFields() {
|
2015-02-13 14:40:36 -05:00
|
|
|
case 0:
|
2016-08-16 12:55:17 -07:00
|
|
|
// nothing to do
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case 1:
|
2016-08-16 12:55:17 -07:00
|
|
|
buf.WriteString(" ")
|
|
|
|
|
buf.WriteString(Tconv(t.Results().Field(0).Type, 0)) // struct->field->field's type
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
default:
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" ")
|
2016-03-08 16:31:28 -08:00
|
|
|
buf.WriteString(Tconv(t.Results(), 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
return buf.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case TSTRUCT:
|
2016-04-01 20:11:30 -07:00
|
|
|
if m := t.StructType().Map; m != nil {
|
|
|
|
|
mt := m.MapType()
|
2015-03-12 18:45:30 -04:00
|
|
|
// Format the bucket struct for map[x]y as map.bucket[x]y.
|
|
|
|
|
// This avoids a recursive print that generates very long names.
|
2016-04-01 20:11:30 -07:00
|
|
|
if mt.Bucket == t {
|
|
|
|
|
return "map.bucket[" + m.Key().String() + "]" + m.Val().String()
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-04-01 20:11:30 -07:00
|
|
|
if mt.Hmap == t {
|
|
|
|
|
return "map.hdr[" + m.Key().String() + "]" + m.Val().String()
|
2016-02-23 07:46:01 +00:00
|
|
|
}
|
|
|
|
|
|
2016-04-01 20:11:30 -07:00
|
|
|
if mt.Hiter == t {
|
|
|
|
|
return "map.iter[" + m.Key().String() + "]" + m.Val().String()
|
2016-02-23 07:46:01 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-13 14:40:36 -05:00
|
|
|
Yyerror("unknown internal map type")
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-12 18:45:30 -04:00
|
|
|
var buf bytes.Buffer
|
2016-04-05 16:44:07 -07:00
|
|
|
if t.IsFuncArgStruct() {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString("(")
|
2016-03-17 00:44:07 -07:00
|
|
|
var flag1 FmtFlag
|
2015-02-13 14:40:36 -05:00
|
|
|
if fmtmode == FTypeId || fmtmode == FErr { // no argument names on function signature, and no "noescape"/"nosplit" tags
|
2016-03-17 00:44:07 -07:00
|
|
|
flag1 = FmtShort
|
|
|
|
|
}
|
|
|
|
|
for i, f := range t.Fields().Slice() {
|
|
|
|
|
if i != 0 {
|
|
|
|
|
buf.WriteString(", ")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-17 00:44:07 -07:00
|
|
|
buf.WriteString(Fldconv(f, flag1))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(")")
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString("struct {")
|
2016-03-17 00:44:07 -07:00
|
|
|
for i, f := range t.Fields().Slice() {
|
|
|
|
|
if i != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(";")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-17 00:44:07 -07:00
|
|
|
buf.WriteString(" ")
|
|
|
|
|
buf.WriteString(Fldconv(f, FmtLong))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-17 00:44:07 -07:00
|
|
|
if t.NumFields() != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(" ")
|
|
|
|
|
}
|
|
|
|
|
buf.WriteString("}")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
return buf.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case TFORW:
|
|
|
|
|
if t.Sym != nil {
|
2016-03-19 16:34:48 -07:00
|
|
|
return "undefined " + t.Sym.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
return "undefined"
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case TUNSAFEPTR:
|
2015-03-12 18:45:30 -04:00
|
|
|
return "unsafe.Pointer"
|
2016-03-31 14:46:04 -07:00
|
|
|
|
|
|
|
|
case TDDDFIELD:
|
2016-04-22 08:39:56 -07:00
|
|
|
return fmt.Sprintf("%v <%v> %v", t.Etype, t.Sym, t.DDDField())
|
2016-04-08 13:33:43 -04:00
|
|
|
|
|
|
|
|
case Txxx:
|
|
|
|
|
return "Txxx"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Don't know how to handle - fall back to detailed prints.
|
2016-04-22 08:39:56 -07:00
|
|
|
return fmt.Sprintf("%v <%v> %v", t.Etype, t.Sym, t.Elem())
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Statements which may be rendered with a simplestmt as init.
|
2015-09-24 23:21:18 +02:00
|
|
|
func stmtwithinit(op Op) bool {
|
2015-02-13 14:40:36 -05:00
|
|
|
switch op {
|
2015-04-01 09:38:44 -07:00
|
|
|
case OIF, OFOR, OSWITCH:
|
2015-02-17 22:13:49 -05:00
|
|
|
return true
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
return false
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func stmtfmt(n *Node) string {
|
|
|
|
|
var f string
|
|
|
|
|
|
|
|
|
|
// some statements allow for an init, but at most one,
|
|
|
|
|
// but we may have an arbitrary number added, eg by typecheck
|
2016-03-01 23:21:55 +00:00
|
|
|
// and inlining. If it doesn't fit the syntax, emit an enclosing
|
2015-02-13 14:40:36 -05:00
|
|
|
// block starting with the init statements.
|
|
|
|
|
|
|
|
|
|
// if we can just say "for" n->ninit; ... then do so
|
2016-03-08 15:10:26 -08:00
|
|
|
simpleinit := n.Ninit.Len() == 1 && n.Ninit.First().Ninit.Len() == 0 && stmtwithinit(n.Op)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
// otherwise, print the inits as separate statements
|
2016-03-08 15:10:26 -08:00
|
|
|
complexinit := n.Ninit.Len() != 0 && !simpleinit && (fmtmode != FErr)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
// but if it was for if/for/switch, put in an extra surrounding block to limit the scope
|
2015-09-24 23:21:18 +02:00
|
|
|
extrablock := complexinit && stmtwithinit(n.Op)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if extrablock {
|
2015-02-13 14:40:36 -05:00
|
|
|
f += "{"
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if complexinit {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf(" %v; ", n.Ninit)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch n.Op {
|
|
|
|
|
case ODCL:
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("var %v %v", n.Left.Sym, n.Left.Type)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case ODCLFIELD:
|
|
|
|
|
if n.Left != nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("%v %v", n.Left, n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-03-12 18:45:30 -04:00
|
|
|
f += Nconv(n.Right, 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-10-22 10:04:23 -07:00
|
|
|
// Don't export "v = <N>" initializing statements, hope they're always
|
2016-03-18 17:21:32 -07:00
|
|
|
// preceded by the DCL which will be re-parsed and typechecked to reproduce
|
2015-02-13 14:40:36 -05:00
|
|
|
// the "v = <N>" again.
|
cmd/internal/gc: emit write barriers at lower level
This is primarily preparation for inlining, not an optimization by itself,
but it still helps some.
name old new delta
BenchmarkBinaryTree17 18.2s × (0.99,1.01) 17.9s × (0.99,1.01) -1.57%
BenchmarkFannkuch11 4.44s × (1.00,1.00) 4.42s × (1.00,1.00) -0.40%
BenchmarkFmtFprintfEmpty 119ns × (0.95,1.02) 118ns × (0.96,1.02) ~
BenchmarkFmtFprintfString 501ns × (0.99,1.02) 486ns × (0.99,1.01) -2.89%
BenchmarkFmtFprintfInt 474ns × (0.99,1.00) 457ns × (0.99,1.01) -3.59%
BenchmarkFmtFprintfIntInt 792ns × (1.00,1.00) 768ns × (1.00,1.01) -3.03%
BenchmarkFmtFprintfPrefixedInt 574ns × (1.00,1.01) 584ns × (0.99,1.03) +1.83%
BenchmarkFmtFprintfFloat 749ns × (1.00,1.00) 739ns × (0.99,1.00) -1.34%
BenchmarkFmtManyArgs 2.94µs × (1.00,1.01) 2.77µs × (1.00,1.00) -5.76%
BenchmarkGobDecode 39.5ms × (0.99,1.01) 39.3ms × (0.99,1.01) ~
BenchmarkGobEncode 39.4ms × (1.00,1.01) 39.4ms × (0.99,1.00) ~
BenchmarkGzip 658ms × (1.00,1.01) 661ms × (0.99,1.01) ~
BenchmarkGunzip 142ms × (1.00,1.00) 142ms × (1.00,1.00) +0.22%
BenchmarkHTTPClientServer 134µs × (0.99,1.01) 133µs × (0.98,1.01) ~
BenchmarkJSONEncode 57.1ms × (0.99,1.01) 56.5ms × (0.99,1.01) ~
BenchmarkJSONDecode 141ms × (1.00,1.00) 143ms × (1.00,1.00) +1.09%
BenchmarkMandelbrot200 6.01ms × (1.00,1.00) 6.01ms × (1.00,1.00) ~
BenchmarkGoParse 10.1ms × (0.91,1.09) 9.6ms × (0.94,1.07) ~
BenchmarkRegexpMatchEasy0_32 207ns × (1.00,1.01) 210ns × (1.00,1.00) +1.45%
BenchmarkRegexpMatchEasy0_1K 592ns × (0.99,1.00) 596ns × (0.99,1.01) +0.68%
BenchmarkRegexpMatchEasy1_32 184ns × (0.99,1.01) 184ns × (0.99,1.01) ~
BenchmarkRegexpMatchEasy1_1K 1.01µs × (1.00,1.00) 1.01µs × (0.99,1.01) ~
BenchmarkRegexpMatchMedium_32 327ns × (0.99,1.00) 327ns × (1.00,1.01) ~
BenchmarkRegexpMatchMedium_1K 92.5µs × (1.00,1.00) 93.0µs × (1.00,1.02) +0.48%
BenchmarkRegexpMatchHard_32 4.79µs × (0.95,1.00) 4.76µs × (0.95,1.01) ~
BenchmarkRegexpMatchHard_1K 136µs × (1.00,1.00) 136µs × (1.00,1.01) ~
BenchmarkRevcomp 900ms × (0.99,1.01) 892ms × (1.00,1.01) ~
BenchmarkTemplate 170ms × (0.99,1.01) 175ms × (0.99,1.00) +2.95%
BenchmarkTimeParse 645ns × (1.00,1.00) 638ns × (1.00,1.00) -1.16%
BenchmarkTimeFormat 740ns × (1.00,1.00) 772ns × (1.00,1.00) +4.39%
Change-Id: I0be905e32791e0cb70ff01f169c4b309a971d981
Reviewed-on: https://go-review.googlesource.com/9159
Reviewed-by: Rick Hudson <rlh@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2015-04-17 00:25:10 -04:00
|
|
|
case OAS, OASWB:
|
2015-04-02 19:58:37 -07:00
|
|
|
if n.Colas && !complexinit {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("%v := %v", n.Left, n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("%v = %v", n.Left, n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case OASOP:
|
2015-03-06 21:18:41 +11:00
|
|
|
if n.Implicit {
|
2015-09-24 23:21:18 +02:00
|
|
|
if Op(n.Etype) == OADD {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("%v++", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("%v--", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-27 19:34:17 +10:00
|
|
|
f += fmt.Sprintf("%v %#v= %v", n.Left, Op(n.Etype), n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OAS2:
|
2015-04-02 19:58:37 -07:00
|
|
|
if n.Colas && !complexinit {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf("%v := %v", hconv(n.List, FmtComma), hconv(n.Rlist, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
fallthrough
|
|
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case OAS2DOTTYPE, OAS2FUNC, OAS2MAPR, OAS2RECV:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf("%v = %v", hconv(n.List, FmtComma), hconv(n.Rlist, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case ORETURN:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf("return %v", hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case ORETJMP:
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("retjmp %v", n.Sym)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OPROC:
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("go %v", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case ODEFER:
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("defer %v", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OIF:
|
2015-02-17 22:13:49 -05:00
|
|
|
if simpleinit {
|
2016-03-08 15:10:26 -08:00
|
|
|
f += fmt.Sprintf("if %v; %v { %v }", n.Ninit.First(), n.Left, n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-05-26 21:30:20 -04:00
|
|
|
f += fmt.Sprintf("if %v { %v }", n.Left, n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-08 15:10:26 -08:00
|
|
|
if n.Rlist.Len() != 0 {
|
2015-05-22 01:16:52 -04:00
|
|
|
f += fmt.Sprintf(" else { %v }", n.Rlist)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case OFOR:
|
|
|
|
|
if fmtmode == FErr { // TODO maybe only if FmtShort, same below
|
|
|
|
|
f += "for loop"
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
f += "for"
|
2015-02-17 22:13:49 -05:00
|
|
|
if simpleinit {
|
2016-03-08 15:10:26 -08:00
|
|
|
f += fmt.Sprintf(" %v;", n.Ninit.First())
|
2015-05-22 01:16:52 -04:00
|
|
|
} else if n.Right != nil {
|
2015-02-13 14:40:36 -05:00
|
|
|
f += " ;"
|
|
|
|
|
}
|
|
|
|
|
|
2015-05-26 21:30:20 -04:00
|
|
|
if n.Left != nil {
|
|
|
|
|
f += fmt.Sprintf(" %v", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-05-22 01:16:52 -04:00
|
|
|
if n.Right != nil {
|
|
|
|
|
f += fmt.Sprintf("; %v", n.Right)
|
2015-02-17 22:13:49 -05:00
|
|
|
} else if simpleinit {
|
2015-02-13 14:40:36 -05:00
|
|
|
f += ";"
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf(" { %v }", n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case ORANGE:
|
|
|
|
|
if fmtmode == FErr {
|
|
|
|
|
f += "for loop"
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-08 15:10:26 -08:00
|
|
|
if n.List.Len() == 0 {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("for range %v { %v }", n.Right, n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf("for %v = range %v { %v }", hconv(n.List, FmtComma), n.Right, n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case OSELECT, OSWITCH:
|
2015-02-13 14:40:36 -05:00
|
|
|
if fmtmode == FErr {
|
2016-04-27 15:10:10 +10:00
|
|
|
f += fmt.Sprintf("%v statement", n.Op)
|
2015-02-13 14:40:36 -05:00
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-27 19:34:17 +10:00
|
|
|
f += n.Op.GoString() // %#v
|
2015-02-17 22:13:49 -05:00
|
|
|
if simpleinit {
|
2016-03-08 15:10:26 -08:00
|
|
|
f += fmt.Sprintf(" %v;", n.Ninit.First())
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-05-26 21:30:20 -04:00
|
|
|
if n.Left != nil {
|
2016-03-16 21:29:17 -05:00
|
|
|
f += fmt.Sprintf(" %s ", Nconv(n.Left, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf(" { %v }", n.List)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-05-25 14:08:13 -07:00
|
|
|
case OXCASE:
|
2016-03-08 15:10:26 -08:00
|
|
|
if n.List.Len() != 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf("case %v: %v", hconv(n.List, FmtComma), n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("default: %v", n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-05-25 14:08:13 -07:00
|
|
|
case OCASE:
|
|
|
|
|
if n.Left != nil {
|
|
|
|
|
f += fmt.Sprintf("case %v: %v", n.Left, n.Nbody)
|
|
|
|
|
} else {
|
|
|
|
|
f += fmt.Sprintf("default: %v", n.Nbody)
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-13 14:40:36 -05:00
|
|
|
case OBREAK,
|
|
|
|
|
OCONTINUE,
|
|
|
|
|
OGOTO,
|
|
|
|
|
OFALL,
|
|
|
|
|
OXFALL:
|
|
|
|
|
if n.Left != nil {
|
2016-04-27 19:34:17 +10:00
|
|
|
f += fmt.Sprintf("%#v %v", n.Op, n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2016-04-27 19:34:17 +10:00
|
|
|
f += n.Op.GoString() // %#v
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case OEMPTY:
|
|
|
|
|
break
|
|
|
|
|
|
|
|
|
|
case OLABEL:
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf("%v: ", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if extrablock {
|
2015-02-13 14:40:36 -05:00
|
|
|
f += "}"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return f
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var opprec = []int{
|
|
|
|
|
OAPPEND: 8,
|
|
|
|
|
OARRAYBYTESTR: 8,
|
|
|
|
|
OARRAYLIT: 8,
|
|
|
|
|
OARRAYRUNESTR: 8,
|
|
|
|
|
OCALLFUNC: 8,
|
|
|
|
|
OCALLINTER: 8,
|
|
|
|
|
OCALLMETH: 8,
|
|
|
|
|
OCALL: 8,
|
|
|
|
|
OCAP: 8,
|
|
|
|
|
OCLOSE: 8,
|
|
|
|
|
OCONVIFACE: 8,
|
|
|
|
|
OCONVNOP: 8,
|
|
|
|
|
OCONV: 8,
|
|
|
|
|
OCOPY: 8,
|
|
|
|
|
ODELETE: 8,
|
2015-04-03 12:23:28 -04:00
|
|
|
OGETG: 8,
|
2015-02-13 14:40:36 -05:00
|
|
|
OLEN: 8,
|
|
|
|
|
OLITERAL: 8,
|
|
|
|
|
OMAKESLICE: 8,
|
|
|
|
|
OMAKE: 8,
|
|
|
|
|
OMAPLIT: 8,
|
|
|
|
|
ONAME: 8,
|
|
|
|
|
ONEW: 8,
|
|
|
|
|
ONONAME: 8,
|
|
|
|
|
OPACK: 8,
|
|
|
|
|
OPANIC: 8,
|
|
|
|
|
OPAREN: 8,
|
|
|
|
|
OPRINTN: 8,
|
|
|
|
|
OPRINT: 8,
|
|
|
|
|
ORUNESTR: 8,
|
|
|
|
|
OSTRARRAYBYTE: 8,
|
|
|
|
|
OSTRARRAYRUNE: 8,
|
|
|
|
|
OSTRUCTLIT: 8,
|
|
|
|
|
OTARRAY: 8,
|
|
|
|
|
OTCHAN: 8,
|
|
|
|
|
OTFUNC: 8,
|
|
|
|
|
OTINTER: 8,
|
|
|
|
|
OTMAP: 8,
|
|
|
|
|
OTSTRUCT: 8,
|
|
|
|
|
OINDEXMAP: 8,
|
|
|
|
|
OINDEX: 8,
|
|
|
|
|
OSLICE: 8,
|
|
|
|
|
OSLICESTR: 8,
|
|
|
|
|
OSLICEARR: 8,
|
|
|
|
|
OSLICE3: 8,
|
|
|
|
|
OSLICE3ARR: 8,
|
|
|
|
|
ODOTINTER: 8,
|
|
|
|
|
ODOTMETH: 8,
|
|
|
|
|
ODOTPTR: 8,
|
|
|
|
|
ODOTTYPE2: 8,
|
|
|
|
|
ODOTTYPE: 8,
|
|
|
|
|
ODOT: 8,
|
|
|
|
|
OXDOT: 8,
|
|
|
|
|
OCALLPART: 8,
|
|
|
|
|
OPLUS: 7,
|
|
|
|
|
ONOT: 7,
|
|
|
|
|
OCOM: 7,
|
|
|
|
|
OMINUS: 7,
|
|
|
|
|
OADDR: 7,
|
|
|
|
|
OIND: 7,
|
|
|
|
|
ORECV: 7,
|
|
|
|
|
OMUL: 6,
|
|
|
|
|
ODIV: 6,
|
|
|
|
|
OMOD: 6,
|
|
|
|
|
OLSH: 6,
|
|
|
|
|
ORSH: 6,
|
|
|
|
|
OAND: 6,
|
|
|
|
|
OANDNOT: 6,
|
|
|
|
|
OADD: 5,
|
|
|
|
|
OSUB: 5,
|
|
|
|
|
OOR: 5,
|
|
|
|
|
OXOR: 5,
|
|
|
|
|
OEQ: 4,
|
|
|
|
|
OLT: 4,
|
|
|
|
|
OLE: 4,
|
|
|
|
|
OGE: 4,
|
|
|
|
|
OGT: 4,
|
|
|
|
|
ONE: 4,
|
|
|
|
|
OCMPSTR: 4,
|
|
|
|
|
OCMPIFACE: 4,
|
|
|
|
|
OSEND: 3,
|
|
|
|
|
OANDAND: 2,
|
|
|
|
|
OOROR: 1,
|
2015-02-20 13:54:45 -05:00
|
|
|
// Statements handled by stmtfmt
|
|
|
|
|
OAS: -1,
|
2015-02-13 14:40:36 -05:00
|
|
|
OAS2: -1,
|
|
|
|
|
OAS2DOTTYPE: -1,
|
|
|
|
|
OAS2FUNC: -1,
|
|
|
|
|
OAS2MAPR: -1,
|
|
|
|
|
OAS2RECV: -1,
|
|
|
|
|
OASOP: -1,
|
|
|
|
|
OBREAK: -1,
|
|
|
|
|
OCASE: -1,
|
|
|
|
|
OCONTINUE: -1,
|
|
|
|
|
ODCL: -1,
|
|
|
|
|
ODCLFIELD: -1,
|
|
|
|
|
ODEFER: -1,
|
|
|
|
|
OEMPTY: -1,
|
|
|
|
|
OFALL: -1,
|
|
|
|
|
OFOR: -1,
|
|
|
|
|
OGOTO: -1,
|
|
|
|
|
OIF: -1,
|
|
|
|
|
OLABEL: -1,
|
|
|
|
|
OPROC: -1,
|
|
|
|
|
ORANGE: -1,
|
|
|
|
|
ORETURN: -1,
|
|
|
|
|
OSELECT: -1,
|
|
|
|
|
OSWITCH: -1,
|
|
|
|
|
OXCASE: -1,
|
|
|
|
|
OXFALL: -1,
|
|
|
|
|
OEND: 0,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func exprfmt(n *Node, prec int) string {
|
2015-03-06 21:18:41 +11:00
|
|
|
for n != nil && n.Implicit && (n.Op == OIND || n.Op == OADDR) {
|
2015-02-13 14:40:36 -05:00
|
|
|
n = n.Left
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if n == nil {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "<N>"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-23 16:07:24 -05:00
|
|
|
nprec := opprec[n.Op]
|
2015-02-13 14:40:36 -05:00
|
|
|
if n.Op == OTYPE && n.Sym != nil {
|
|
|
|
|
nprec = 8
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if prec > nprec {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("(%v)", n)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch n.Op {
|
|
|
|
|
case OPAREN:
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("(%v)", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case ODDDARG:
|
2015-03-12 18:45:30 -04:00
|
|
|
return "... argument"
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OREGISTER:
|
2015-04-13 10:28:57 -07:00
|
|
|
return obj.Rconv(int(n.Reg))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OLITERAL: // this is a bit of a mess
|
2015-03-03 23:28:00 -05:00
|
|
|
if fmtmode == FErr {
|
|
|
|
|
if n.Orig != nil && n.Orig != n {
|
|
|
|
|
return exprfmt(n.Orig, prec)
|
|
|
|
|
}
|
|
|
|
|
if n.Sym != nil {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return sconv(n.Sym, 0)
|
2015-03-03 23:28:00 -05:00
|
|
|
}
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-05-27 00:47:05 -04:00
|
|
|
if n.Val().Ctype() == CTNIL && n.Orig != nil && n.Orig != n {
|
2015-03-03 23:28:00 -05:00
|
|
|
return exprfmt(n.Orig, prec)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-12-14 14:07:21 -05:00
|
|
|
if n.Type != nil && n.Type.Etype != TIDEAL && n.Type.Etype != TNIL && n.Type != idealbool && n.Type != idealstring {
|
2015-02-13 14:40:36 -05:00
|
|
|
// Need parens when type begins with what might
|
|
|
|
|
// be misinterpreted as a unary operator: * or <-.
|
2016-04-02 16:26:30 -07:00
|
|
|
if n.Type.IsPtr() || (n.Type.IsChan() && n.Type.ChanDir() == Crecv) {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("(%v)(%v)", n.Type, vconv(n.Val(), 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("%v(%v)", n.Type, vconv(n.Val(), 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return vconv(n.Val(), 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-10-22 10:04:23 -07:00
|
|
|
// Special case: name used as local variable in export.
|
2015-02-13 14:40:36 -05:00
|
|
|
// _ becomes ~b%d internally; print as _ for export
|
|
|
|
|
case ONAME:
|
2016-08-16 12:55:17 -07:00
|
|
|
if fmtmode == FErr && n.Sym != nil && n.Sym.Name[0] == '~' && n.Sym.Name[1] == 'b' {
|
2015-02-28 20:31:32 +00:00
|
|
|
return "_"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
fallthrough
|
|
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case OPACK, ONONAME:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return sconv(n.Sym, 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OTYPE:
|
|
|
|
|
if n.Type == nil && n.Sym != nil {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return sconv(n.Sym, 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
return Tconv(n.Type, 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OTARRAY:
|
|
|
|
|
if n.Left != nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("[]%v", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-18 17:21:32 -07:00
|
|
|
return fmt.Sprintf("[]%v", n.Right) // happens before typecheck
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OTMAP:
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("map[%v]%v", n.Left, n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OTCHAN:
|
2016-04-03 22:58:10 +00:00
|
|
|
switch ChanDir(n.Etype) {
|
2015-02-13 14:40:36 -05:00
|
|
|
case Crecv:
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("<-chan %v", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case Csend:
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("chan<- %v", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
default:
|
2016-04-03 22:58:10 +00:00
|
|
|
if n.Left != nil && n.Left.Op == OTCHAN && n.Left.Sym == nil && ChanDir(n.Left.Etype) == Crecv {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("chan (%v)", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("chan %v", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case OTSTRUCT:
|
2015-03-12 18:45:30 -04:00
|
|
|
return "<struct>"
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OTINTER:
|
2015-03-12 18:45:30 -04:00
|
|
|
return "<inter>"
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OTFUNC:
|
2015-03-12 18:45:30 -04:00
|
|
|
return "<func>"
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OCLOSURE:
|
|
|
|
|
if fmtmode == FErr {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "func literal"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-04-24 13:50:26 -07:00
|
|
|
if n.Nbody.Len() != 0 {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("%v { %v }", n.Type, n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-05-27 00:56:19 -04:00
|
|
|
return fmt.Sprintf("%v { %v }", n.Type, n.Func.Closure.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OCOMPLIT:
|
2016-03-30 15:09:25 -07:00
|
|
|
ptrlit := n.Right != nil && n.Right.Implicit && n.Right.Type != nil && n.Right.Type.IsPtr()
|
2015-02-13 14:40:36 -05:00
|
|
|
if fmtmode == FErr {
|
2015-03-06 21:18:41 +11:00
|
|
|
if n.Right != nil && n.Right.Type != nil && !n.Implicit {
|
2015-02-17 22:13:49 -05:00
|
|
|
if ptrlit {
|
2016-03-30 10:57:47 -07:00
|
|
|
return fmt.Sprintf("&%v literal", n.Right.Type.Elem())
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("%v literal", n.Right.Type)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-27 22:44:15 +00:00
|
|
|
return "composite literal"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("(%v{ %v })", n.Right, hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OPTRLIT:
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("&%v", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-08-16 12:55:17 -07:00
|
|
|
case OSTRUCTLIT, OARRAYLIT, OMAPLIT:
|
2015-02-13 14:40:36 -05:00
|
|
|
if fmtmode == FErr {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("%v literal", n.Type)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("(%v{ %v })", n.Type, hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OKEY:
|
|
|
|
|
if n.Left != nil && n.Right != nil {
|
2016-08-16 12:55:17 -07:00
|
|
|
return fmt.Sprintf("%v:%v", n.Left, n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if n.Left == nil && n.Right != nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf(":%v", n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-02-17 22:13:49 -05:00
|
|
|
if n.Left != nil && n.Right == nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("%v:", n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-12 18:45:30 -04:00
|
|
|
return ":"
|
2015-02-13 14:40:36 -05:00
|
|
|
|
cmd/compile: change ODOT and friends to use Sym, not Right
The Node type ODOT and its variants all represent a selector, with a
simple name to the right of the dot. Before this change this was
represented by using an ONAME Node in the Right field. This ONAME node
served no useful purpose. This CL changes these Node types to store the
symbol in the Sym field instead, thus not requiring allocating a Node
for each selector.
When compiling x/tools/go/types this CL eliminates nearly 5000 calls to
newname and reduces the total number of Nodes allocated by about 6.6%.
It seems to cut compilation time by 1 to 2 percent.
Getting this right was somewhat subtle, and I added two dubious changes
to produce the exact same output as before. One is to ishairy in
inl.go: the ONAME node increased the cost of ODOT and friends by 1, and
I retained that, although really ODOT is not more expensive than any
other node. The other is to varexpr in walk.go: because the ONAME in
the Right field of an ODOT has no class, varexpr would always return
false for an ODOT, although in fact for some ODOT's it seemingly ought
to return true; I added an && false for now. I will send separate CLs,
that will break toolstash -cmp, to clean these up.
This CL passes toolstash -cmp.
Change-Id: I4af8a10cc59078c436130ce472f25abc3a9b2f80
Reviewed-on: https://go-review.googlesource.com/20890
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
2016-03-18 16:52:30 -07:00
|
|
|
case OCALLPART:
|
2015-02-23 16:07:24 -05:00
|
|
|
var f string
|
2015-02-13 14:40:36 -05:00
|
|
|
f += exprfmt(n.Left, nprec)
|
|
|
|
|
if n.Right == nil || n.Right.Sym == nil {
|
|
|
|
|
f += ".<nil>"
|
|
|
|
|
return f
|
|
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf(".%v", sconv(n.Right.Sym, FmtShort|FmtByte))
|
2015-02-13 14:40:36 -05:00
|
|
|
return f
|
|
|
|
|
|
cmd/compile: change ODOT and friends to use Sym, not Right
The Node type ODOT and its variants all represent a selector, with a
simple name to the right of the dot. Before this change this was
represented by using an ONAME Node in the Right field. This ONAME node
served no useful purpose. This CL changes these Node types to store the
symbol in the Sym field instead, thus not requiring allocating a Node
for each selector.
When compiling x/tools/go/types this CL eliminates nearly 5000 calls to
newname and reduces the total number of Nodes allocated by about 6.6%.
It seems to cut compilation time by 1 to 2 percent.
Getting this right was somewhat subtle, and I added two dubious changes
to produce the exact same output as before. One is to ishairy in
inl.go: the ONAME node increased the cost of ODOT and friends by 1, and
I retained that, although really ODOT is not more expensive than any
other node. The other is to varexpr in walk.go: because the ONAME in
the Right field of an ODOT has no class, varexpr would always return
false for an ODOT, although in fact for some ODOT's it seemingly ought
to return true; I added an && false for now. I will send separate CLs,
that will break toolstash -cmp, to clean these up.
This CL passes toolstash -cmp.
Change-Id: I4af8a10cc59078c436130ce472f25abc3a9b2f80
Reviewed-on: https://go-review.googlesource.com/20890
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
2016-03-18 16:52:30 -07:00
|
|
|
case OXDOT, ODOT, ODOTPTR, ODOTINTER, ODOTMETH:
|
|
|
|
|
var f string
|
|
|
|
|
f += exprfmt(n.Left, nprec)
|
|
|
|
|
if n.Sym == nil {
|
|
|
|
|
f += ".<nil>"
|
|
|
|
|
return f
|
|
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf(".%v", sconv(n.Sym, FmtShort|FmtByte))
|
cmd/compile: change ODOT and friends to use Sym, not Right
The Node type ODOT and its variants all represent a selector, with a
simple name to the right of the dot. Before this change this was
represented by using an ONAME Node in the Right field. This ONAME node
served no useful purpose. This CL changes these Node types to store the
symbol in the Sym field instead, thus not requiring allocating a Node
for each selector.
When compiling x/tools/go/types this CL eliminates nearly 5000 calls to
newname and reduces the total number of Nodes allocated by about 6.6%.
It seems to cut compilation time by 1 to 2 percent.
Getting this right was somewhat subtle, and I added two dubious changes
to produce the exact same output as before. One is to ishairy in
inl.go: the ONAME node increased the cost of ODOT and friends by 1, and
I retained that, although really ODOT is not more expensive than any
other node. The other is to varexpr in walk.go: because the ONAME in
the Right field of an ODOT has no class, varexpr would always return
false for an ODOT, although in fact for some ODOT's it seemingly ought
to return true; I added an && false for now. I will send separate CLs,
that will break toolstash -cmp, to clean these up.
This CL passes toolstash -cmp.
Change-Id: I4af8a10cc59078c436130ce472f25abc3a9b2f80
Reviewed-on: https://go-review.googlesource.com/20890
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
2016-03-18 16:52:30 -07:00
|
|
|
return f
|
|
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case ODOTTYPE, ODOTTYPE2:
|
2015-02-23 16:07:24 -05:00
|
|
|
var f string
|
2015-02-13 14:40:36 -05:00
|
|
|
f += exprfmt(n.Left, nprec)
|
|
|
|
|
if n.Right != nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf(".(%v)", n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
return f
|
|
|
|
|
}
|
2015-04-17 12:03:22 -04:00
|
|
|
f += fmt.Sprintf(".(%v)", n.Type)
|
2015-02-13 14:40:36 -05:00
|
|
|
return f
|
|
|
|
|
|
2016-04-21 11:55:33 -07:00
|
|
|
case OINDEX, OINDEXMAP:
|
|
|
|
|
return fmt.Sprintf("%s[%v]", exprfmt(n.Left, nprec), n.Right)
|
|
|
|
|
|
|
|
|
|
case OSLICE, OSLICESTR, OSLICEARR, OSLICE3, OSLICE3ARR:
|
|
|
|
|
var buf bytes.Buffer
|
|
|
|
|
buf.WriteString(exprfmt(n.Left, nprec))
|
|
|
|
|
buf.WriteString("[")
|
|
|
|
|
low, high, max := n.SliceBounds()
|
|
|
|
|
if low != nil {
|
|
|
|
|
buf.WriteString(low.String())
|
|
|
|
|
}
|
|
|
|
|
buf.WriteString(":")
|
|
|
|
|
if high != nil {
|
|
|
|
|
buf.WriteString(high.String())
|
|
|
|
|
}
|
|
|
|
|
if n.Op.IsSlice3() {
|
|
|
|
|
buf.WriteString(":")
|
|
|
|
|
if max != nil {
|
|
|
|
|
buf.WriteString(max.String())
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
buf.WriteString("]")
|
|
|
|
|
return buf.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case OCOPY, OCOMPLEX:
|
2016-04-27 19:34:17 +10:00
|
|
|
return fmt.Sprintf("%#v(%v, %v)", n.Op, n.Left, n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OCONV,
|
|
|
|
|
OCONVIFACE,
|
|
|
|
|
OCONVNOP,
|
|
|
|
|
OARRAYBYTESTR,
|
|
|
|
|
OARRAYRUNESTR,
|
|
|
|
|
OSTRARRAYBYTE,
|
|
|
|
|
OSTRARRAYRUNE,
|
|
|
|
|
ORUNESTR:
|
|
|
|
|
if n.Type == nil || n.Type.Sym == nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("(%v)(%v)", n.Type, n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
if n.Left != nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("%v(%v)", n.Type, n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("%v(%v)", n.Type, hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OREAL,
|
|
|
|
|
OIMAG,
|
|
|
|
|
OAPPEND,
|
|
|
|
|
OCAP,
|
|
|
|
|
OCLOSE,
|
|
|
|
|
ODELETE,
|
|
|
|
|
OLEN,
|
|
|
|
|
OMAKE,
|
|
|
|
|
ONEW,
|
|
|
|
|
OPANIC,
|
|
|
|
|
ORECOVER,
|
|
|
|
|
OPRINT,
|
|
|
|
|
OPRINTN:
|
|
|
|
|
if n.Left != nil {
|
2016-04-27 19:34:17 +10:00
|
|
|
return fmt.Sprintf("%#v(%v)", n.Op, n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-03-09 16:24:07 +11:00
|
|
|
if n.Isddd {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("%#v(%v...)", n.Op, hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("%#v(%v)", n.Op, hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-04-03 12:23:28 -04:00
|
|
|
case OCALL, OCALLFUNC, OCALLINTER, OCALLMETH, OGETG:
|
2015-02-23 16:07:24 -05:00
|
|
|
var f string
|
2015-02-13 14:40:36 -05:00
|
|
|
f += exprfmt(n.Left, nprec)
|
2015-03-09 16:24:07 +11:00
|
|
|
if n.Isddd {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf("(%v...)", hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
return f
|
|
|
|
|
}
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
f += fmt.Sprintf("(%v)", hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
return f
|
|
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case OMAKEMAP, OMAKECHAN, OMAKESLICE:
|
2016-03-08 15:10:26 -08:00
|
|
|
if n.List.Len() != 0 { // pre-typecheck
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return fmt.Sprintf("make(%v, %v)", n.Type, hconv(n.List, FmtComma))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
if n.Right != nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("make(%v, %v, %v)", n.Type, n.Left, n.Right)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-04-01 13:36:24 -07:00
|
|
|
if n.Left != nil && (n.Op == OMAKESLICE || !n.Left.Type.IsUntyped()) {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("make(%v, %v)", n.Type, n.Left)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("make(%v)", n.Type)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
// Unary
|
|
|
|
|
case OPLUS,
|
|
|
|
|
OMINUS,
|
|
|
|
|
OADDR,
|
|
|
|
|
OCOM,
|
|
|
|
|
OIND,
|
|
|
|
|
ONOT,
|
|
|
|
|
ORECV:
|
2016-04-27 19:34:17 +10:00
|
|
|
f := n.Op.GoString() // %#v
|
2015-02-13 14:40:36 -05:00
|
|
|
if n.Left.Op == n.Op {
|
2016-04-27 19:34:17 +10:00
|
|
|
f += " "
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
f += exprfmt(n.Left, nprec+1)
|
|
|
|
|
return f
|
|
|
|
|
|
|
|
|
|
// Binary
|
|
|
|
|
case OADD,
|
|
|
|
|
OAND,
|
|
|
|
|
OANDAND,
|
|
|
|
|
OANDNOT,
|
|
|
|
|
ODIV,
|
|
|
|
|
OEQ,
|
|
|
|
|
OGE,
|
|
|
|
|
OGT,
|
|
|
|
|
OLE,
|
|
|
|
|
OLT,
|
|
|
|
|
OLSH,
|
|
|
|
|
OMOD,
|
|
|
|
|
OMUL,
|
|
|
|
|
ONE,
|
|
|
|
|
OOR,
|
|
|
|
|
OOROR,
|
|
|
|
|
ORSH,
|
|
|
|
|
OSEND,
|
|
|
|
|
OSUB,
|
|
|
|
|
OXOR:
|
2015-02-23 16:07:24 -05:00
|
|
|
var f string
|
2015-02-13 14:40:36 -05:00
|
|
|
f += exprfmt(n.Left, nprec)
|
|
|
|
|
|
2016-04-27 19:34:17 +10:00
|
|
|
f += fmt.Sprintf(" %#v ", n.Op)
|
2015-02-13 14:40:36 -05:00
|
|
|
f += exprfmt(n.Right, nprec+1)
|
|
|
|
|
return f
|
|
|
|
|
|
|
|
|
|
case OADDSTR:
|
2015-02-23 16:07:24 -05:00
|
|
|
var f string
|
2016-03-04 13:16:48 -08:00
|
|
|
i := 0
|
2016-03-08 15:10:26 -08:00
|
|
|
for _, n1 := range n.List.Slice() {
|
2016-03-04 13:16:48 -08:00
|
|
|
if i != 0 {
|
2015-02-28 20:31:32 +00:00
|
|
|
f += " + "
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-08 15:10:26 -08:00
|
|
|
f += exprfmt(n1, nprec)
|
2016-03-04 13:16:48 -08:00
|
|
|
i++
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return f
|
|
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case OCMPSTR, OCMPIFACE:
|
2015-02-23 16:07:24 -05:00
|
|
|
var f string
|
2015-02-13 14:40:36 -05:00
|
|
|
f += exprfmt(n.Left, nprec)
|
2015-09-24 23:21:18 +02:00
|
|
|
// TODO(marvin): Fix Node.EType type union.
|
2016-04-27 19:34:17 +10:00
|
|
|
f += fmt.Sprintf(" %#v ", Op(n.Etype))
|
2015-02-13 14:40:36 -05:00
|
|
|
f += exprfmt(n.Right, nprec+1)
|
|
|
|
|
return f
|
2016-03-16 18:44:17 -05:00
|
|
|
|
|
|
|
|
case ODCLCONST:
|
|
|
|
|
// if exporting, DCLCONST should just be removed as its usage
|
|
|
|
|
// has already been replaced with literals
|
|
|
|
|
if fmtbody {
|
|
|
|
|
return ""
|
|
|
|
|
}
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-04-27 15:10:10 +10:00
|
|
|
return fmt.Sprintf("<node %v>", n.Op)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
func nodefmt(n *Node, flag FmtFlag) string {
|
2015-02-23 16:07:24 -05:00
|
|
|
t := n.Type
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
// we almost always want the original, except in export mode for literals
|
|
|
|
|
// this saves the importer some work, and avoids us having to redo some
|
|
|
|
|
// special casing for package unsafe
|
2016-08-16 12:55:17 -07:00
|
|
|
if n.Op != OLITERAL && n.Orig != nil {
|
2015-02-13 14:40:36 -05:00
|
|
|
n = n.Orig
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtLong != 0 && t != nil {
|
2015-02-13 14:40:36 -05:00
|
|
|
if t.Etype == TNIL {
|
2015-02-28 20:31:32 +00:00
|
|
|
return "nil"
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
2015-04-17 12:03:22 -04:00
|
|
|
return fmt.Sprintf("%v (type %v)", n, t)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO inlining produces expressions with ninits. we can't print these yet.
|
|
|
|
|
|
|
|
|
|
if opprec[n.Op] < 0 {
|
|
|
|
|
return stmtfmt(n)
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-27 22:44:15 +00:00
|
|
|
return exprfmt(n, 0)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var dumpdepth int
|
|
|
|
|
|
2015-03-12 18:45:30 -04:00
|
|
|
func indent(buf *bytes.Buffer) {
|
|
|
|
|
buf.WriteString("\n")
|
|
|
|
|
for i := 0; i < dumpdepth; i++ {
|
|
|
|
|
buf.WriteString(". ")
|
|
|
|
|
}
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
func nodedump(n *Node, flag FmtFlag) string {
|
2015-02-13 14:40:36 -05:00
|
|
|
if n == nil {
|
2015-03-12 18:45:30 -04:00
|
|
|
return ""
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
recur := flag&FmtShort == 0
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-03-12 18:45:30 -04:00
|
|
|
var buf bytes.Buffer
|
2015-02-17 22:13:49 -05:00
|
|
|
if recur {
|
2015-03-12 18:45:30 -04:00
|
|
|
indent(&buf)
|
2015-02-13 14:40:36 -05:00
|
|
|
if dumpdepth > 10 {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString("...")
|
|
|
|
|
return buf.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-08 15:10:26 -08:00
|
|
|
if n.Ninit.Len() != 0 {
|
2016-04-27 15:10:10 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-init%v", n.Op, n.Ninit)
|
2015-03-12 18:45:30 -04:00
|
|
|
indent(&buf)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch n.Op {
|
|
|
|
|
default:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
fmt.Fprintf(&buf, "%v%v", n.Op, jconv(n, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case OREGISTER, OINDREG:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-%v%v", n.Op, obj.Rconv(int(n.Reg)), jconv(n, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OLITERAL:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-%v%v", n.Op, vconv(n.Val(), 0), jconv(n, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2015-04-01 09:38:44 -07:00
|
|
|
case ONAME, ONONAME:
|
2015-02-13 14:40:36 -05:00
|
|
|
if n.Sym != nil {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-%v%v", n.Op, n.Sym, jconv(n, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
} else {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
fmt.Fprintf(&buf, "%v%v", n.Op, jconv(n, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-02-19 12:06:31 -05:00
|
|
|
if recur && n.Type == nil && n.Name != nil && n.Name.Param != nil && n.Name.Param.Ntype != nil {
|
2015-03-12 18:45:30 -04:00
|
|
|
indent(&buf)
|
2016-04-27 15:10:10 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-ntype%v", n.Op, n.Name.Param.Ntype)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case OASOP:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-%v%v", n.Op, Op(n.Etype), jconv(n, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
case OTYPE:
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
fmt.Fprintf(&buf, "%v %v%v type=%v", n.Op, n.Sym, jconv(n, 0), n.Type)
|
2015-05-27 00:44:05 -04:00
|
|
|
if recur && n.Type == nil && n.Name.Param.Ntype != nil {
|
2015-03-12 18:45:30 -04:00
|
|
|
indent(&buf)
|
2016-04-27 15:10:10 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-ntype%v", n.Op, n.Name.Param.Ntype)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if n.Sym != nil && n.Op != ONAME {
|
2015-05-27 00:47:05 -04:00
|
|
|
fmt.Fprintf(&buf, " %v", n.Sym)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if n.Type != nil {
|
2015-04-17 12:03:22 -04:00
|
|
|
fmt.Fprintf(&buf, " %v", n.Type)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-17 22:13:49 -05:00
|
|
|
if recur {
|
2015-02-13 14:40:36 -05:00
|
|
|
if n.Left != nil {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(Nconv(n.Left, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
if n.Right != nil {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(Nconv(n.Right, 0))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2016-03-08 15:10:26 -08:00
|
|
|
if n.List.Len() != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
indent(&buf)
|
2016-04-27 15:10:10 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-list%v", n.Op, n.List)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-08 15:10:26 -08:00
|
|
|
if n.Rlist.Len() != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
indent(&buf)
|
2016-04-27 15:10:10 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-rlist%v", n.Op, n.Rlist)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-04-24 13:50:26 -07:00
|
|
|
if n.Nbody.Len() != 0 {
|
2015-03-12 18:45:30 -04:00
|
|
|
indent(&buf)
|
2016-04-27 15:10:10 +10:00
|
|
|
fmt.Fprintf(&buf, "%v-body%v", n.Op, n.Nbody)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-12 18:45:30 -04:00
|
|
|
return buf.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-04-17 11:56:29 -04:00
|
|
|
func (s *Sym) String() string {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return sconv(s, 0)
|
2015-04-17 11:56:29 -04:00
|
|
|
}
|
|
|
|
|
|
2015-02-13 14:40:36 -05:00
|
|
|
// Fmt "%S": syms
|
|
|
|
|
// Flags: "%hS" suppresses qualifying with package
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
func sconv(s *Sym, flag FmtFlag) string {
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtLong != 0 {
|
2015-02-13 14:40:36 -05:00
|
|
|
panic("linksymfmt")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if s == nil {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "<S>"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if s.Name == "_" {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "_"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-23 16:07:24 -05:00
|
|
|
sf := flag
|
2015-12-30 19:47:36 -05:00
|
|
|
sm, sb := setfmode(&flag)
|
2015-02-13 14:40:36 -05:00
|
|
|
str := symfmt(s, flag)
|
|
|
|
|
flag = sf
|
|
|
|
|
fmtmode = sm
|
2015-12-30 19:47:36 -05:00
|
|
|
fmtbody = sb
|
2015-02-13 14:40:36 -05:00
|
|
|
return str
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-17 11:56:29 -04:00
|
|
|
func (t *Type) String() string {
|
|
|
|
|
return Tconv(t, 0)
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
func Fldconv(f *Field, flag FmtFlag) string {
|
2016-03-14 01:20:49 -07:00
|
|
|
if f == nil {
|
|
|
|
|
return "<T>"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sf := flag
|
|
|
|
|
sm, sb := setfmode(&flag)
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
if fmtmode == FTypeId && (sf&FmtUnsigned != 0) {
|
2016-03-14 01:20:49 -07:00
|
|
|
fmtpkgpfx++
|
|
|
|
|
}
|
|
|
|
|
if fmtpkgpfx != 0 {
|
2016-03-15 13:06:58 -07:00
|
|
|
flag |= FmtUnsigned
|
2016-03-14 01:20:49 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var name string
|
2016-03-15 13:06:58 -07:00
|
|
|
if flag&FmtShort == 0 {
|
2016-03-14 01:20:49 -07:00
|
|
|
s := f.Sym
|
|
|
|
|
|
|
|
|
|
// Take the name from the original, lest we substituted it with ~r%d or ~b%d.
|
|
|
|
|
// ~r%d is a (formerly) unnamed result.
|
2016-08-16 12:55:17 -07:00
|
|
|
if fmtmode == FErr && f.Nname != nil {
|
2016-03-14 01:20:49 -07:00
|
|
|
if f.Nname.Orig != nil {
|
|
|
|
|
s = f.Nname.Orig.Sym
|
|
|
|
|
if s != nil && s.Name[0] == '~' {
|
|
|
|
|
if s.Name[1] == 'r' { // originally an unnamed result
|
|
|
|
|
s = nil
|
|
|
|
|
} else if s.Name[1] == 'b' { // originally the blank identifier _
|
|
|
|
|
s = Lookup("_")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
s = nil
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if s != nil && f.Embedded == 0 {
|
2016-05-25 10:01:58 -04:00
|
|
|
if f.Funarg != FunargNone {
|
2016-03-14 01:20:49 -07:00
|
|
|
name = Nconv(f.Nname, 0)
|
2016-03-15 13:06:58 -07:00
|
|
|
} else if flag&FmtLong != 0 {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
name = sconv(s, FmtShort|FmtByte) // qualify non-exported names (used on structs, not on funarg)
|
2016-03-14 01:20:49 -07:00
|
|
|
} else {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
name = sconv(s, 0)
|
2016-03-14 01:20:49 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var typ string
|
|
|
|
|
if f.Isddd {
|
2016-03-30 10:57:47 -07:00
|
|
|
typ = "..." + Tconv(f.Type.Elem(), 0)
|
2016-03-14 01:20:49 -07:00
|
|
|
} else {
|
|
|
|
|
typ = Tconv(f.Type, 0)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
str := typ
|
|
|
|
|
if name != "" {
|
|
|
|
|
str = name + " " + typ
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// The fmtbody flag is intended to suppress escape analysis annotations
|
|
|
|
|
// when printing a function type used in a function body.
|
|
|
|
|
// (The escape analysis tags do not apply to func vars.)
|
|
|
|
|
// But it must not suppress struct field tags.
|
|
|
|
|
// See golang.org/issue/13777 and golang.org/issue/14331.
|
2016-05-25 10:01:58 -04:00
|
|
|
if flag&FmtShort == 0 && (!fmtbody || f.Funarg == FunargNone) && f.Note != "" {
|
2016-04-25 13:24:48 -07:00
|
|
|
str += " " + strconv.Quote(f.Note)
|
2016-03-14 01:20:49 -07:00
|
|
|
}
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
if fmtmode == FTypeId && (sf&FmtUnsigned != 0) {
|
2016-03-14 01:20:49 -07:00
|
|
|
fmtpkgpfx--
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flag = sf
|
|
|
|
|
fmtbody = sb
|
|
|
|
|
fmtmode = sm
|
|
|
|
|
return str
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-13 14:40:36 -05:00
|
|
|
// Fmt "%T": types.
|
|
|
|
|
// Flags: 'l' print definition, not name
|
|
|
|
|
// 'h' omit 'func' and receiver from function types, short type names
|
|
|
|
|
// 'u' package name, not prefix (FTypeId mode, sticky)
|
2016-03-15 13:06:58 -07:00
|
|
|
func Tconv(t *Type, flag FmtFlag) string {
|
2015-02-13 14:40:36 -05:00
|
|
|
if t == nil {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "<T>"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if t.Trecur > 4 {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "<...>"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
t.Trecur++
|
2015-02-23 16:07:24 -05:00
|
|
|
sf := flag
|
2015-12-30 19:47:36 -05:00
|
|
|
sm, sb := setfmode(&flag)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
if fmtmode == FTypeId && (sf&FmtUnsigned != 0) {
|
2015-02-13 14:40:36 -05:00
|
|
|
fmtpkgpfx++
|
|
|
|
|
}
|
|
|
|
|
if fmtpkgpfx != 0 {
|
2016-03-15 13:06:58 -07:00
|
|
|
flag |= FmtUnsigned
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
str := typefmt(t, flag)
|
|
|
|
|
|
2016-03-15 13:06:58 -07:00
|
|
|
if fmtmode == FTypeId && (sf&FmtUnsigned != 0) {
|
2015-02-13 14:40:36 -05:00
|
|
|
fmtpkgpfx--
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flag = sf
|
2015-12-30 19:47:36 -05:00
|
|
|
fmtbody = sb
|
2015-02-13 14:40:36 -05:00
|
|
|
fmtmode = sm
|
|
|
|
|
t.Trecur--
|
|
|
|
|
return str
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-17 11:56:29 -04:00
|
|
|
func (n *Node) String() string {
|
|
|
|
|
return Nconv(n, 0)
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-13 14:40:36 -05:00
|
|
|
// Fmt '%N': Nodes.
|
|
|
|
|
// Flags: 'l' suffix with "(type %T)" where possible
|
|
|
|
|
// '+h' in debug mode, don't recurse, no multiline output
|
2016-03-15 13:06:58 -07:00
|
|
|
func Nconv(n *Node, flag FmtFlag) string {
|
2015-02-13 14:40:36 -05:00
|
|
|
if n == nil {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "<N>"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
2015-02-23 16:07:24 -05:00
|
|
|
sf := flag
|
2015-12-30 19:47:36 -05:00
|
|
|
sm, sb := setfmode(&flag)
|
2015-02-13 14:40:36 -05:00
|
|
|
|
|
|
|
|
var str string
|
|
|
|
|
switch fmtmode {
|
2016-08-16 12:55:17 -07:00
|
|
|
case FErr:
|
2015-02-13 14:40:36 -05:00
|
|
|
str = nodefmt(n, flag)
|
|
|
|
|
|
|
|
|
|
case FDbg:
|
|
|
|
|
dumpdepth++
|
|
|
|
|
str = nodedump(n, flag)
|
|
|
|
|
dumpdepth--
|
|
|
|
|
|
|
|
|
|
default:
|
2015-08-30 23:10:03 +02:00
|
|
|
Fatalf("unhandled %%N mode")
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flag = sf
|
2015-12-30 19:47:36 -05:00
|
|
|
fmtbody = sb
|
2015-02-13 14:40:36 -05:00
|
|
|
fmtmode = sm
|
|
|
|
|
return str
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-27 14:31:33 -08:00
|
|
|
func (n Nodes) String() string {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
return hconv(n, 0)
|
2016-02-27 14:31:33 -08:00
|
|
|
}
|
|
|
|
|
|
2016-03-10 10:00:29 -08:00
|
|
|
// Fmt '%H': Nodes.
|
2015-02-13 14:40:36 -05:00
|
|
|
// Flags: all those of %N plus ',': separate with comma's instead of semicolons.
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
func hconv(l Nodes, flag FmtFlag) string {
|
2016-03-08 15:10:26 -08:00
|
|
|
if l.Len() == 0 && fmtmode == FDbg {
|
2015-02-27 22:44:15 +00:00
|
|
|
return "<nil>"
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2015-02-23 16:07:24 -05:00
|
|
|
sf := flag
|
2015-12-30 19:47:36 -05:00
|
|
|
sm, sb := setfmode(&flag)
|
2015-02-23 16:07:24 -05:00
|
|
|
sep := "; "
|
2015-02-13 14:40:36 -05:00
|
|
|
if fmtmode == FDbg {
|
|
|
|
|
sep = "\n"
|
2016-03-15 13:06:58 -07:00
|
|
|
} else if flag&FmtComma != 0 {
|
2015-02-13 14:40:36 -05:00
|
|
|
sep = ", "
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-12 18:45:30 -04:00
|
|
|
var buf bytes.Buffer
|
2016-03-09 12:39:36 -08:00
|
|
|
for i, n := range l.Slice() {
|
|
|
|
|
buf.WriteString(Nconv(n, 0))
|
|
|
|
|
if i+1 < l.Len() {
|
2015-03-12 18:45:30 -04:00
|
|
|
buf.WriteString(sep)
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
flag = sf
|
2015-12-30 19:47:36 -05:00
|
|
|
fmtbody = sb
|
2015-02-13 14:40:36 -05:00
|
|
|
fmtmode = sm
|
2015-03-12 18:45:30 -04:00
|
|
|
return buf.String()
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-08 10:26:20 -08:00
|
|
|
func dumplist(s string, l Nodes) {
|
cmd/compile/internal/gc: unexport {J,S,F,H,B,V}conv
Updates #15462
Unexport Jconv, Sconv, Fconv, Hconv, Bconv, and VConv as they are
not referenced outside internal/gc.
Econv was only called by EType.String, so merge it into that method.
Change-Id: Iad9b06078eb513b85a03a43cd9eb9366477643d1
Reviewed-on: https://go-review.googlesource.com/22531
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
2016-04-27 15:15:47 +10:00
|
|
|
fmt.Printf("%s%v\n", s, hconv(l, FmtSign))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func Dump(s string, n *Node) {
|
2016-03-15 13:06:58 -07:00
|
|
|
fmt.Printf("%s [%p]%v\n", s, n, Nconv(n, FmtSign))
|
2015-02-13 14:40:36 -05:00
|
|
|
}
|