From 42f387aae123ec416b57d84ba96ec4a5ef0e8a1b Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Wed, 24 May 2023 16:30:49 +0000 Subject: [PATCH] Revert "cmd/compile: enable printing of error URLs by default" This reverts commit e7a9ca0a53db4b4f357b5d3caaef65e44ce08a90. Reason for revert: Decided to delay to Go 1.22. Change-Id: I4635cb4c1372b54cac573041be8a43e294de5183 Reviewed-on: https://go-review.googlesource.com/c/go/+/497975 TryBot-Result: Gopher Robot Run-TryBot: Robert Griesemer Reviewed-by: Russ Cox Auto-Submit: Robert Griesemer Reviewed-by: Robert Griesemer --- src/cmd/compile/internal/base/flag.go | 1 - src/cmd/internal/testdir/testdir_test.go | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cmd/compile/internal/base/flag.go b/src/cmd/compile/internal/base/flag.go index a5441ffac2..753a60ae1e 100644 --- a/src/cmd/compile/internal/base/flag.go +++ b/src/cmd/compile/internal/base/flag.go @@ -164,7 +164,6 @@ func ParseFlags() { Flag.LinkShared = &Ctxt.Flag_linkshared Flag.Shared = &Ctxt.Flag_shared Flag.WB = true - Flag.ErrorURL = true Debug.ConcurrentOk = true Debug.InlFuncsWithClosures = 1 diff --git a/src/cmd/internal/testdir/testdir_test.go b/src/cmd/internal/testdir/testdir_test.go index d9f78f2f6a..c86cc20a9c 100644 --- a/src/cmd/internal/testdir/testdir_test.go +++ b/src/cmd/internal/testdir/testdir_test.go @@ -184,7 +184,7 @@ func compileInDir(runcmd runCmd, dir string, flags []string, importcfg string, p if importcfg == "" { importcfg = stdlibImportcfgFile() } - cmd := []string{goTool, "tool", "compile", "-e", "-D", "test", "-errorurl=false", "-importcfg=" + importcfg} + cmd := []string{goTool, "tool", "compile", "-e", "-D", "test", "-importcfg=" + importcfg} if pkgname == "main" { cmd = append(cmd, "-p=main") } else { @@ -201,7 +201,7 @@ func compileInDir(runcmd runCmd, dir string, flags []string, importcfg string, p return runcmd(cmd...) } -var stdlibImportcfgStringOnce sync.Once // TODO(#56102): Use sync.OnceValue once available. Also below. +var stdlibImportcfgStringOnce sync.Once // TODO(#56102): Use sync.OnceValue once availabe. Also below. var stdlibImportcfgString string func stdlibImportcfg() string { @@ -745,7 +745,7 @@ func (t test) run() error { // Fail if wantError is true and compilation was successful and vice versa. // Match errors produced by gc against errors in comments. // TODO(gri) remove need for -C (disable printing of columns in error messages) - cmdline := []string{goTool, "tool", "compile", "-p=p", "-d=panic", "-C", "-e", "-errorurl=false", "-importcfg=" + stdlibImportcfgFile(), "-o", "a.o"} + cmdline := []string{goTool, "tool", "compile", "-p=p", "-d=panic", "-C", "-e", "-importcfg=" + stdlibImportcfgFile(), "-o", "a.o"} // No need to add -dynlink even if linkshared if we're just checking for errors... cmdline = append(cmdline, flags...) cmdline = append(cmdline, long) -- 2.48.1