cmd/{go,compile}: run gofmt

Ran gofmt on a couple of Go source files that needed it.

Change-Id: I0e9f78831f531a728b892a63c6e0c517d92b11a8
Reviewed-on: https://go-review.googlesource.com/c/go/+/507156
Run-TryBot: Than McIntosh <thanm@google.com>
Reviewed-by: Austin Clements <austin@google.com>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Than McIntosh 2023-06-29 11:44:04 -04:00
parent da5d8fdd0c
commit fe73c186eb
5 changed files with 11 additions and 12 deletions

View file

@ -4,11 +4,11 @@
// Package devirtualize implements two "devirtualization" optimization passes: // Package devirtualize implements two "devirtualization" optimization passes:
// //
// - "Static" devirtualization which replaces interface method calls with // - "Static" devirtualization which replaces interface method calls with
// direct concrete-type method calls where possible. // direct concrete-type method calls where possible.
// - "Profile-guided" devirtualization which replaces indirect calls with a // - "Profile-guided" devirtualization which replaces indirect calls with a
// conditional direct call to the hottest concrete callee from a profile, as // conditional direct call to the hottest concrete callee from a profile, as
// well as a fallback using the original indirect call. // well as a fallback using the original indirect call.
package devirtualize package devirtualize
import ( import (

View file

@ -607,7 +607,7 @@ func tcSwitchType(n *ir.SwitchStmt) {
if !n1.Type().IsInterface() { if !n1.Type().IsInterface() {
why := ImplementsExplain(n1.Type(), t) why := ImplementsExplain(n1.Type(), t)
if why != "" { if why != "" {
base.ErrorfAt(ncase.Pos(), errors.ImpossibleAssert, "impossible type switch case: %L cannot have dynamic type %v (%s)" , guard.X, n1.Type(), why) base.ErrorfAt(ncase.Pos(), errors.ImpossibleAssert, "impossible type switch case: %L cannot have dynamic type %v (%s)", guard.X, n1.Type(), why)
} }
continue continue
} }

View file

@ -713,12 +713,12 @@ func ImplementsExplain(t, iface *types.Type) string {
return fmt.Sprintf("%v does not implement %v (%v method is marked 'nointerface')", t, iface, missing.Sym) return fmt.Sprintf("%v does not implement %v (%v method is marked 'nointerface')", t, iface, missing.Sym)
} else if have != nil && have.Sym == missing.Sym { } else if have != nil && have.Sym == missing.Sym {
return fmt.Sprintf("%v does not implement %v (wrong type for %v method)\n"+ return fmt.Sprintf("%v does not implement %v (wrong type for %v method)\n"+
"\t\thave %v%S\n\t\twant %v%S", t, iface, missing.Sym, have.Sym, have.Type, missing.Sym, missing.Type) "\t\thave %v%S\n\t\twant %v%S", t, iface, missing.Sym, have.Sym, have.Type, missing.Sym, missing.Type)
} else if ptr != 0 { } else if ptr != 0 {
return fmt.Sprintf("%v does not implement %v (%v method has pointer receiver)", t, iface, missing.Sym) return fmt.Sprintf("%v does not implement %v (%v method has pointer receiver)", t, iface, missing.Sym)
} else if have != nil { } else if have != nil {
return fmt.Sprintf("%v does not implement %v (missing %v method)\n"+ return fmt.Sprintf("%v does not implement %v (missing %v method)\n"+
"\t\thave %v%S\n\t\twant %v%S", t, iface, missing.Sym, have.Sym, have.Type, missing.Sym, missing.Type) "\t\thave %v%S\n\t\twant %v%S", t, iface, missing.Sym, have.Sym, have.Type, missing.Sym, missing.Type)
} }
return fmt.Sprintf("%v does not implement %v (missing %v method)", t, iface, missing.Sym) return fmt.Sprintf("%v does not implement %v (missing %v method)", t, iface, missing.Sym)
} }

View file

@ -111,7 +111,6 @@ func IsPrerelease(x string) bool {
// //
// Prev("1.2") = "1.1" // Prev("1.2") = "1.1"
// Prev("1.3rc4") = "1.2" // Prev("1.3rc4") = "1.2"
//
func Prev(x string) string { func Prev(x string) string {
v := parse(x) v := parse(x)
if cmpInt(v.minor, "1") <= 0 { if cmpInt(v.minor, "1") <= 0 {

View file

@ -300,10 +300,10 @@ func maybeStartTrace(pctx context.Context) context.Context {
// //
// We have to handle the -C flag this way for two reasons: // We have to handle the -C flag this way for two reasons:
// //
// 1. Toolchain selection needs to be in the right directory to look for go.mod and go.work. // 1. Toolchain selection needs to be in the right directory to look for go.mod and go.work.
// //
// 2. A toolchain switch later on reinvokes the new go command with the same arguments. // 2. A toolchain switch later on reinvokes the new go command with the same arguments.
// The parent toolchain has already done the chdir; the child must not try to do it again. // The parent toolchain has already done the chdir; the child must not try to do it again.
func handleChdirFlag() { func handleChdirFlag() {
_, used := lookupCmd(os.Args[1:]) _, used := lookupCmd(os.Args[1:])
used++ // because of [1:] used++ // because of [1:]