From b6c5a5baa7c2c4df7ec8016e9a766dcc57895582 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Thu, 12 May 2022 14:06:31 -0700 Subject: [PATCH] cmd/compile/internal/gc: parse command-line flags earlier This CL moves the call to base.ParseFlags() earlier in compiler startup. This is necessary so CL 393715 can use base.Ctxt.Pkgpath to construct types.LocalPkg. Updates #51734. Change-Id: I9f5f75dc9d5fd1b1d22e98523efc95e6cec64385 Reviewed-on: https://go-review.googlesource.com/c/go/+/406055 Reviewed-by: David Chase Run-TryBot: Matthew Dempsky TryBot-Result: Gopher Robot --- src/cmd/compile/internal/gc/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go index 1f547130ad..e9483decaa 100644 --- a/src/cmd/compile/internal/gc/main.go +++ b/src/cmd/compile/internal/gc/main.go @@ -70,6 +70,9 @@ func Main(archInit func(*ssagen.ArchInfo)) { // See bugs 31188 and 21945 (CLs 170638, 98075, 72371). base.Ctxt.UseBASEntries = base.Ctxt.Headtype != objabi.Hdarwin + base.DebugSSA = ssa.PhaseOption + base.ParseFlags() + types.LocalPkg = types.NewPkg("", "") types.LocalPkg.Prefix = "\"\"" @@ -100,9 +103,6 @@ func Main(archInit func(*ssagen.ArchInfo)) { // pseudo-package used for methods with anonymous receivers ir.Pkgs.Go = types.NewPkg("go", "") - base.DebugSSA = ssa.PhaseOption - base.ParseFlags() - // Record flags that affect the build result. (And don't // record flags that don't, since that would cause spurious // changes in the binary.)