go/internal/gccgoimporter: recognize "any" as a builtin type

ianlancetaylor · ianlancetaylor · commit b8ac61e6e64c · 2024-02-02T23:14:07.000Z
In CL 536715 we're changing the gofrontend export data to report "any" as a builtin type. This permits us to distinguish the builtin type from some other package-level type "any". That requires an update to this code. Change-Id: I91d75a056a155fa9892c4b25ab396cb4d39cc8e4 Reviewed-on: https://go-review.googlesource.com/c/go/+/537195 Reviewed-by: Than McIntosh <thanm@google.com> Reviewed-by: David Chase <drchase@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Cherry Mui <cherryyz@google.com>
diff --git a/src/go/internal/gccgoimporter/parser.go b/src/go/internal/gccgoimporter/parser.go
@@ -902,6 +902,7 @@ const (
 	gccgoBuiltinERROR      = 19
 	gccgoBuiltinBYTE       = 20
 	gccgoBuiltinRUNE       = 21
+	gccgoBuiltinANY        = 22
 )
 
 func lookupBuiltinType(typ int) types.Type {
@@ -926,6 +927,7 @@ func lookupBuiltinType(typ int) types.Type {
 		gccgoBuiltinERROR:      types.Universe.Lookup("error").Type(),
 		gccgoBuiltinBYTE:       types.Universe.Lookup("byte").Type(),
 		gccgoBuiltinRUNE:       types.Universe.Lookup("rune").Type(),
+		gccgoBuiltinANY:        types.Universe.Lookup("any").Type(),
 	}[typ]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -902,6 +902,7 @@ const (`
`902`	`902`	`gccgoBuiltinERROR = 19`
`903`	`903`	`gccgoBuiltinBYTE = 20`
`904`	`904`	`gccgoBuiltinRUNE = 21`
	`905`	`+ gccgoBuiltinANY = 22`
`905`	`906`	`)`
`906`	`907`
`907`	`908`	`func lookupBuiltinType(typ int) types.Type {`
`@@ -926,6 +927,7 @@ func lookupBuiltinType(typ int) types.Type {`
`926`	`927`	`gccgoBuiltinERROR: types.Universe.Lookup("error").Type(),`
`927`	`928`	`gccgoBuiltinBYTE: types.Universe.Lookup("byte").Type(),`
`928`	`929`	`gccgoBuiltinRUNE: types.Universe.Lookup("rune").Type(),`
	`930`	`+ gccgoBuiltinANY: types.Universe.Lookup("any").Type(),`
`929`	`931`	`}[typ]`
`930`	`932`	`}`
`931`	`933`