qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 01:24:39 -07:00
Code Releases Activity

cmd/compile/internal: fix receiver names are different

Browse Source 
Change-Id: I78a7d34a6e2558ecff0274170bffaa51e038d0bc
Reviewed-on: https://go-review.googlesource.com/c/go/+/522415
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Keith Randall <khr@google.com>
Run-TryBot: shuang cui <imcusg@gmail.com>
Auto-Submit: Keith Randall <khr@golang.org>
This commit is contained in:
cui fliter 2023-08-24 11:18:18 +08:00 committed by Gopher Robot
parent 86f0f08461
commit 43e69b330a
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmd/compile/internal/noder/writer.go
View File

@ -2834,9 +2834,9 @@ func isNil(p *pkgWriter, expr syntax.Expr) bool {
// isBuiltin reports whether expr is a (possibly parenthesized) // isBuiltin reports whether expr is a (possibly parenthesized)
// referenced to the specified built-in function. // referenced to the specified built-in function.
func (p *pkgWriter) isBuiltin(expr syntax.Expr, builtin string) bool { func (pw *pkgWriter) isBuiltin(expr syntax.Expr, builtin string) bool {
if name, ok := unparen(expr).(*syntax.Name); ok && name.Value == builtin { if name, ok := unparen(expr).(*syntax.Name); ok && name.Value == builtin {
return p.typeAndValue(name).IsBuiltin() return pw.typeAndValue(name).IsBuiltin()
} }
return false return false
} }
@ -2946,7 +2946,7 @@ func lastNonEmptyStmt(stmts []syntax.Stmt) syntax.Stmt {
// terminates reports whether stmt terminates normal control flow // terminates reports whether stmt terminates normal control flow
// (i.e., does not merely advance to the following statement). // (i.e., does not merely advance to the following statement).
func (p *pkgWriter) terminates(stmt syntax.Stmt) bool { func (pw *pkgWriter) terminates(stmt syntax.Stmt) bool {
switch stmt := stmt.(type) { switch stmt := stmt.(type) {
case *syntax.BranchStmt: case *syntax.BranchStmt:
if stmt.Tok == syntax.Goto { if stmt.Tok == syntax.Goto {
@ -2956,7 +2956,7 @@ func (p *pkgWriter) terminates(stmt syntax.Stmt) bool {
return true return true
case *syntax.ExprStmt: case *syntax.ExprStmt:
if call, ok := unparen(stmt.X).(*syntax.CallExpr); ok { if call, ok := unparen(stmt.X).(*syntax.CallExpr); ok {
if p.isBuiltin(call.Fun, "panic") { if pw.isBuiltin(call.Fun, "panic") {
return true return true
} }
} }
@ -2969,10 +2969,10 @@ func (p *pkgWriter) terminates(stmt syntax.Stmt) bool {
// } // }
// unreachable // unreachable
case *syntax.IfStmt: case *syntax.IfStmt:
cond := p.staticBool(&stmt.Cond) cond := pw.staticBool(&stmt.Cond)
return (cond < 0 || p.terminates(stmt.Then)) && (cond > 0 || p.terminates(stmt.Else)) return (cond < 0 || pw.terminates(stmt.Then)) && (cond > 0 || pw.terminates(stmt.Else))
case *syntax.BlockStmt: case *syntax.BlockStmt:
return p.terminates(lastNonEmptyStmt(stmt.List)) return pw.terminates(lastNonEmptyStmt(stmt.List))
} }
return false return false

10
src/cmd/compile/internal/pgo/internal/graph/graph.go
View File

@ -466,9 +466,9 @@ func (g *Graph) String() string {
// Sort returns a slice of the edges in the map, in a consistent // Sort returns a slice of the edges in the map, in a consistent
// order. The sort order is first based on the edge weight // order. The sort order is first based on the edge weight
// (higher-to-lower) and then by the node names to avoid flakiness. // (higher-to-lower) and then by the node names to avoid flakiness.
func (e EdgeMap) Sort() []*Edge { func (em EdgeMap) Sort() []*Edge {
el := make(edgeList, 0, len(e)) el := make(edgeList, 0, len(em))
for _, w := range e { for _, w := range em {
el = append(el, w) el = append(el, w)
} }
@ -477,9 +477,9 @@ func (e EdgeMap) Sort() []*Edge {
} }
// Sum returns the total weight for a set of nodes. // Sum returns the total weight for a set of nodes.
func (e EdgeMap) Sum() int64 { func (em EdgeMap) Sum() int64 {
var ret int64 var ret int64
for _, edge := range e { for _, edge := range em {
ret += edge.Weight ret += edge.Weight
} }
return ret return ret

4
src/cmd/compile/internal/ssa/debug.go
View File

@ -70,8 +70,8 @@ func (ls *liveSlot) String() string {
return fmt.Sprintf("0x%x.%d.%d", ls.Registers, ls.stackOffsetValue(), int32(ls.StackOffset)&1) return fmt.Sprintf("0x%x.%d.%d", ls.Registers, ls.stackOffsetValue(), int32(ls.StackOffset)&1)
} }
func (loc liveSlot) absent() bool { func (ls liveSlot) absent() bool {
return loc.Registers == 0 && !loc.onStack() return ls.Registers == 0 && !ls.onStack()
} }
// StackOffset encodes whether a value is on the stack and if so, where. // StackOffset encodes whether a value is on the stack and if so, where.

12
src/cmd/compile/internal/ssa/expand_calls.go
View File

@ -64,15 +64,15 @@ type registerCursor struct {
regValues *[]*Value // values assigned to registers accumulate here regValues *[]*Value // values assigned to registers accumulate here
} }
func (rc *registerCursor) String() string { func (c *registerCursor) String() string {
dest := "<none>" dest := "<none>"
if rc.storeDest != nil { if c.storeDest != nil {
dest = rc.storeDest.String() dest = c.storeDest.String()
} }
regs := "<none>" regs := "<none>"
if rc.regValues != nil { if c.regValues != nil {
regs = "" regs = ""
for i, x := range *rc.regValues { for i, x := range *c.regValues {
if i > 0 { if i > 0 {
regs = regs + "; " regs = regs + "; "
} }
@ -80,7 +80,7 @@ func (rc *registerCursor) String() string {
} }
} }
// not printing the config because that has not been useful // not printing the config because that has not been useful
return fmt.Sprintf("RCSR{storeDest=%v, regsLen=%d, nextSlice=%d, regValues=[%s]}", dest, rc.regsLen, rc.nextSlice, regs) return fmt.Sprintf("RCSR{storeDest=%v, regsLen=%d, nextSlice=%d, regValues=[%s]}", dest, c.regsLen, c.nextSlice, regs)
} }
// next effectively post-increments the register cursor; the receiver is advanced, // next effectively post-increments the register cursor; the receiver is advanced,