From: Matthew Dempsky <mdempsky@google.com>
Date: Wed, 25 Sep 2019 07:14:58 +0000 (-0700)
Subject: cmd/compile: remove -s flag
X-Git-Tag: go1.14beta1~984
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3e428363c4b793c552925703f206b9382fdfcb51;p=gostls13.git

cmd/compile: remove -s flag

This is better handled by tools like cmd/gofmt, which can
automatically rewrite the source code and already supports a syntactic
version of this simplification. (go/types can be used if
type-sensitive simplification is actually necessary.)

Change-Id: I51332a8f3ff4ab3087bc6b43a491c6d92b717228
Reviewed-on: https://go-review.googlesource.com/c/go/+/197118
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index dff33ee530..f75e35c3be 100644
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -238,7 +238,6 @@ func Main(archInit func(*Arch)) {
 	if sys.RaceDetectorSupported(objabi.GOOS, objabi.GOARCH) {
 		flag.BoolVar(&flag_race, "race", false, "enable race detector")
 	}
-	objabi.Flagcount("s", "warn about composite literals that can be simplified", &Debug['s'])
 	if enableTrace {
 		flag.BoolVar(&trace, "t", false, "trace type-checking")
 	}
diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go
index 48a3e1100e..b35ab543ec 100644
--- a/src/cmd/compile/internal/gc/typecheck.go
+++ b/src/cmd/compile/internal/gc/typecheck.go
@@ -2747,11 +2747,6 @@ func pushtype(n *Node, t *types.Type) {
 		n.Right = typenod(t)
 		n.SetImplicit(true)       // don't print
 		n.Right.SetImplicit(true) // * is okay
-	} else if Debug['s'] != 0 {
-		n.Right = typecheck(n.Right, ctxType)
-		if n.Right.Type != nil && types.Identical(n.Right.Type, t) {
-			fmt.Printf("%v: redundant type: %v\n", n.Line(), t)
-		}
 	}
 }