internal/proto: remove use of MessageType.GoType

neild · neild · commit 62f67f1ea9df · 2019-10-04T06:22:09.000Z
Remove use in preparation for dropping the GoType method entirely. Change-Id: Ia6df16acbf30c77b26c33eacf6d68fb59d776ca5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/198817 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/internal/proto/registry.go b/internal/proto/registry.go
@@ -285,7 +285,7 @@ func MessageType(s messageName) reflect.Type {
 	var t reflect.Type
 	mt, _ := protoregistry.GlobalTypes.FindMessageByName(pref.FullName(s))
 	if mt != nil {
-		t = mt.GoType()
+		t = reflect.TypeOf(mt.Zero().Interface())
 	}
 	// TODO: Support retrieving Go map types for map entry messages?
 

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ func MessageType(s messageName) reflect.Type {`
`285`	`285`	`var t reflect.Type`
`286`	`286`	`mt, _ := protoregistry.GlobalTypes.FindMessageByName(pref.FullName(s))`
`287`	`287`	`if mt != nil {`
`288`		`- t = mt.GoType()`
	`288`	`+ t = reflect.TypeOf(mt.Zero().Interface())`
`289`	`289`	`}`
`290`	`290`	`// TODO: Support retrieving Go map types for map entry messages?`
`291`	`291`