From: Than McIntosh <thanm@google.com>
Date: Tue, 24 Nov 2020 23:09:00 +0000 (-0500)
Subject: [dev.regabi] cmd/compile: refactor type initialization code into helper
X-Git-Tag: go1.17beta1~1539^2~329
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2b76429eb01ec1752f7622e3011babd7140ab870;p=gostls13.git

[dev.regabi] cmd/compile: refactor type initialization code into helper

Create a helper routine for initializing the types package, so as make
it easier to use in unit testing (in a follow-on patch).

Change-Id: I0f937788dfd34ac6641a4f28c16e47008aa08116
Reviewed-on: https://go-review.googlesource.com/c/go/+/273010
Run-TryBot: Than McIntosh <thanm@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Than McIntosh <thanm@google.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index 503dc449d3..368fe1fcab 100644
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -210,13 +210,7 @@ func Main(archInit func(*Arch)) {
 	// initialize types package
 	// (we need to do this to break dependencies that otherwise
 	// would lead to import cycles)
-	types.Widthptr = Widthptr
-	types.Dowidth = dowidth
-	types.TypeLinkSym = func(t *types.Type) *obj.LSym {
-		return typenamesym(t).Linksym()
-	}
-
-	initUniverse()
+	initializeTypesPackage()
 
 	dclcontext = ir.PEXTERN
 
@@ -1125,3 +1119,13 @@ func parseLang(s string) (lang, error) {
 	}
 	return lang{major: major, minor: minor}, nil
 }
+
+func initializeTypesPackage() {
+	types.Widthptr = Widthptr
+	types.Dowidth = dowidth
+	types.TypeLinkSym = func(t *types.Type) *obj.LSym {
+		return typenamesym(t).Linksym()
+	}
+
+	initUniverse()
+}