cmd/protoc-gen-go: convert field number to uint64 before shifting

Avoid generating invalid tag and wire size for large oneof field numbers
which overflow int32.

Change-Id: I005fe32aba4944b33b6b6ba83ef0ddd4d6e5863b
Reviewed-on: https://go-review.googlesource.com/138519
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>

cmd/protoc-gen-go/internal_gengo/oneof.go

@@ -314,7 +314,7 @@ func genOneofFieldSizer(g *protogen.GeneratedFile, field *protogen.Field) {
 		g.P("s := ", sizeProto, "(x.", field.GoName, ")")
 	}
 	// Tag and wire varint is known statically.
-	tagAndWireSize := proto.SizeVarint(uint64(field.Desc.Number() << 3)) // wire doesn't affect arint size
+	tagAndWireSize := proto.SizeVarint(uint64(field.Desc.Number()) << 3) // wire doesn't affect varint size
 	g.P("n += ", tagAndWireSize, " // tag and wire")
 	switch field.Desc.Kind() {
 	case protoreflect.BoolKind:

cmd/protoc-gen-go/testdata/proto2/fields.pb.go

@@ -161,6 +161,7 @@ type FieldTestMessage struct {
 	//	*FieldTestMessage_OneofBytes
 	//	*FieldTestMessage_Oneof_Message
 	//	*FieldTestMessage_Oneofgroup
+	//	*FieldTestMessage_OneofLargestTag
 	OneofField isFieldTestMessage_OneofField `protobuf_oneof:"oneof_field"`
 	// Types that are valid to be assigned to OneofTwo:
 	//	*FieldTestMessage_OneofTwo_1
@@ -863,6 +864,10 @@ type FieldTestMessage_Oneofgroup struct {
 	Oneofgroup *FieldTestMessage_OneofGroup `protobuf:"group,618,opt,name=OneofGroup,json=oneofgroup,oneof"`
 }
 
+type FieldTestMessage_OneofLargestTag struct {
+	OneofLargestTag int32 `protobuf:"varint,536870911,opt,name=oneof_largest_tag,json=oneofLargestTag,oneof"`
+}
+
 func (*FieldTestMessage_OneofBool) isFieldTestMessage_OneofField() {}
 
 func (*FieldTestMessage_OneofEnum) isFieldTestMessage_OneofField() {}
@@ -899,6 +904,8 @@ func (*FieldTestMessage_Oneof_Message) isFieldTestMessage_OneofField() {}
 
 func (*FieldTestMessage_Oneofgroup) isFieldTestMessage_OneofField() {}
 
+func (*FieldTestMessage_OneofLargestTag) isFieldTestMessage_OneofField() {}
+
 func (m *FieldTestMessage) GetOneofField() isFieldTestMessage_OneofField {
 	if m != nil {
 		return m.OneofField
@@ -1032,6 +1039,13 @@ func (m *FieldTestMessage) GetOneofgroup() *FieldTestMessage_OneofGroup {
 	return nil
 }
 
+func (m *FieldTestMessage) GetOneofLargestTag() int32 {
+	if x, ok := m.GetOneofField().(*FieldTestMessage_OneofLargestTag); ok {
+		return x.OneofLargestTag
+	}
+	return 0
+}
+
 type isFieldTestMessage_OneofTwo interface {
 	isFieldTestMessage_OneofTwo()
 }
@@ -1090,6 +1104,7 @@ func (*FieldTestMessage) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buff
 		(*FieldTestMessage_OneofBytes)(nil),
 		(*FieldTestMessage_Oneof_Message)(nil),
 		(*FieldTestMessage_Oneofgroup)(nil),
+		(*FieldTestMessage_OneofLargestTag)(nil),
 		(*FieldTestMessage_OneofTwo_1)(nil),
 		(*FieldTestMessage_OneofTwo_2)(nil),
 	}
@@ -1162,6 +1177,9 @@ func _FieldTestMessage_OneofMarshaler(msg proto.Message, b *proto.Buffer) error
 			return err
 		}
 		b.EncodeVarint(618<<3 | proto.WireEndGroup)
+	case *FieldTestMessage_OneofLargestTag:
+		b.EncodeVarint(536870911<<3 | proto.WireVarint)
+		b.EncodeVarint(uint64(x.OneofLargestTag))
 	case nil:
 	default:
 		return fmt.Errorf("FieldTestMessage.OneofField has unexpected type %T", x)
@@ -1312,6 +1330,13 @@ func _FieldTestMessage_OneofUnmarshaler(msg proto.Message, tag, wire int, b *pro
 		err := b.DecodeGroup(msg)
 		m.OneofField = &FieldTestMessage_Oneofgroup{msg}
 		return true, err
+	case 536870911: // oneof_field.oneof_largest_tag
+		if wire != proto.WireVarint {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeVarint()
+		m.OneofField = &FieldTestMessage_OneofLargestTag{int32(x)}
+		return true, err
 	case 700: // oneof_two.oneof_two_1
 		if wire != proto.WireVarint {
 			return true, proto.ErrInternalBadWireType
@@ -1394,6 +1419,9 @@ func _FieldTestMessage_OneofSizer(msg proto.Message) (n int) {
 		n += 2 // tag and wire
 		n += proto.Size(x.Oneofgroup)
 		n += 2 // tag and wire
+	case *FieldTestMessage_OneofLargestTag:
+		n += 5 // tag and wire
+		n += proto.SizeVarint(uint64(x.OneofLargestTag))
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -1616,123 +1644,125 @@ func init() {
 func init() { proto.RegisterFile("proto2/fields.proto", fileDescriptor_fd8a9d72b841fd68) }
 
 var fileDescriptor_fd8a9d72b841fd68 = []byte{
-	// 1881 bytes of a gzipped FileDescriptorProto
+	// 1912 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0x5b, 0x73, 0x23, 0x47,
 	0x15, 0xc7, 0x35, 0x23, 0xc9, 0xb6, 0xda, 0x92, 0x25, 0xb7, 0xb3, 0x55, 0xcd, 0x3e, 0x35, 0x4b,
-	0x20, 0xb3, 0xec, 0xae, 0x85, 0xb5, 0x93, 0x4e, 0x22, 0x8a, 0x02, 0x5c, 0x78, 0x31, 0x0f, 0xec,
-	0xc2, 0x90, 0x2d, 0xaa, 0x1c, 0xaa, 0x5c, 0x63, 0x7b, 0xa4, 0x88, 0x48, 0x33, 0x8a, 0x34, 0xda,
-	0x8d, 0xf9, 0x14, 0x5c, 0xbf, 0x00, 0xef, 0xdc, 0xef, 0x10, 0x3e, 0x00, 0xf7, 0xfb, 0x25, 0x09,
-	0x64, 0xb9, 0x5f, 0x5f, 0x81, 0x67, 0xea, 0xf4, 0xe9, 0xee, 0xe9, 0x1e, 0xf9, 0xc1, 0xf6, 0x93,
-	0xad, 0xa3, 0xff, 0x39, 0xff, 0x3e, 0xad, 0xfe, 0x1d, 0xb5, 0x86, 0x6c, 0x4d, 0x67, 0x59, 0x9e,
-	0xf5, 0xba, 0x83, 0x51, 0x32, 0x3e, 0x99, 0x6f, 0xcb, 0x57, 0xf4, 0xca, 0x30, 0x93, 0xff, 0xe0,
-	0xcb, 0x63, 0xfc, 0xd3, 0xbb, 0xf6, 0xd9, 0x9b, 0xa4, 0x73, 0x07, 0x74, 0xcf, 0x26, 0xf3, 0xfc,
-	0xfd, 0xc9, 0x7c, 0x1e, 0x0f, 0x13, 0xfa, 0x26, 0xd2, 0xca, 0xa6, 0xf9, 0x28, 0x4b, 0xe3, 0xf1,
-	0xe1, 0x51, 0x96, 0x8d, 0x99, 0xc7, 0xbd, 0x60, 0x2d, 0x6a, 0xea, 0xe0, 0x6e, 0x96, 0x8d, 0xe9,
-	0x07, 0x2d, 0x51, 0x92, 0x2e, 0x26, 0xcc, 0xe7, 0x5e, 0xb0, 0xd1, 0xbb, 0xb9, 0x7d, 0xa6, 0xd1,
-	0x76, 0xd9, 0x64, 0x7b, 0x2f, 0x5d, 0x4c, 0x8a, 0x92, 0xf0, 0x8a, 0xbe, 0x99, 0x6c, 0x98, 0x92,
-	0xa3, 0x34, 0xbf, 0xdd, 0x63, 0x55, 0xee, 0x05, 0xf5, 0xc8, 0x18, 0xbd, 0x0f, 0x82, 0xf4, 0x09,
-	0xd2, 0x36, 0xb2, 0x39, 0xea, 0x6a, 0xdc, 0x0b, 0x36, 0x23, 0x93, 0xfd, 0xa1, 0xd1, 0x92, 0x70,
-	0x81, 0xc2, 0x3a, 0xf7, 0x82, 0x56, 0x21, 0xbc, 0x8f, 0xc2, 0x92, 0xb1, 0x08, 0xd9, 0x0a, 0xf7,
-	0x82, 0xaa, 0x63, 0x2c, 0xc2, 0x25, 0x63, 0x11, 0xb2, 0x55, 0xee, 0x05, 0xd4, 0x35, 0x2e, 0x09,
-	0x17, 0x28, 0x5c, 0xe3, 0x5e, 0x50, 0x73, 0x8d, 0x45, 0x48, 0x6f, 0x90, 0xcd, 0xa2, 0xe2, 0x60,
-	0xf4, 0x52, 0x72, 0x72, 0xbb, 0xc7, 0x1a, 0xdc, 0x0b, 0xda, 0x51, 0xc7, 0xd4, 0x54, 0x71, 0x7a,
-	0x9d, 0x98, 0xd8, 0xa1, 0xd6, 0x12, 0xee, 0x05, 0xab, 0x91, 0x71, 0xbb, 0xa3, 0xa4, 0x76, 0x43,
-	0x83, 0x71, 0x16, 0xe7, 0x6c, 0x9d, 0x7b, 0x81, 0x5f, 0x34, 0x74, 0x07, 0x82, 0x67, 0xd8, 0x8b,
-	0x90, 0x35, 0xb9, 0x17, 0x74, 0xca, 0xf6, 0x22, 0x5c, 0xb6, 0x17, 0x21, 0x6b, 0x71, 0x2f, 0x58,
-	0x29, 0xd9, 0x97, 0xfa, 0x3f, 0xc9, 0x16, 0x47, 0xe3, 0x84, 0x6d, 0x70, 0x2f, 0xf0, 0x8a, 0xfe,
-	0xdf, 0x23, 0xa3, 0xee, 0x8e, 0xe6, 0xb3, 0x51, 0x3a, 0x64, 0x6d, 0xee, 0x05, 0x0d, 0x6b, 0x47,
-	0x65, 0xd4, 0x69, 0xe8, 0xe8, 0x34, 0x4f, 0xe6, 0xac, 0xc3, 0xbd, 0xa0, 0x59, 0x34, 0xb4, 0x0b,
-	0x41, 0x7a, 0x60, 0xad, 0x51, 0x1d, 0x34, 0xb6, 0xc9, 0xbd, 0x60, 0xbd, 0xd7, 0x3d, 0xef, 0xb9,
-	0x54, 0x7f, 0x8b, 0xa6, 0x34, 0x15, 0xcf, 0x15, 0x07, 0x7e, 0x38, 0xcb, 0x16, 0x53, 0x46, 0xb9,
-	0x17, 0x90, 0xde, 0x93, 0xe7, 0x2d, 0x7c, 0x4f, 0x25, 0xbf, 0x17, 0x92, 0x23, 0xb7, 0x16, 0x20,
-	0x37, 0x4b, 0x5e, 0x5c, 0x8c, 0x66, 0xc9, 0x09, 0x22, 0x97, 0x70, 0x1f, 0x90, 0xd3, 0x41, 0x8d,
-	0x9c, 0x11, 0x49, 0xe4, 0x06, 0xdc, 0xbf, 0x38, 0x72, 0xba, 0x84, 0x46, 0xce, 0x94, 0x44, 0x42,
-	0x86, 0xdc, 0x07, 0xe4, 0x74, 0xd4, 0x20, 0x67, 0x64, 0x0a, 0xb9, 0xe7, 0xb9, 0x0f, 0xc8, 0xe9,
-	0x70, 0x81, 0x9c, 0x11, 0x2a, 0xe4, 0x46, 0xdc, 0x07, 0xe4, 0x74, 0xb8, 0x40, 0xce, 0x36, 0x16,
-	0x21, 0xfb, 0x28, 0xf7, 0x01, 0x39, 0xcb, 0x18, 0x4f, 0x92, 0x63, 0x2c, 0x42, 0xf6, 0x02, 0xf7,
-	0x01, 0x39, 0xdb, 0xb8, 0x24, 0x54, 0xc8, 0x8d, 0xb9, 0x0f, 0xc8, 0xd9, 0xc6, 0x88, 0x5c, 0x51,
-	0x51, 0x63, 0x34, 0xe1, 0x3e, 0x20, 0x67, 0x6a, 0x5a, 0xc8, 0x19, 0xb1, 0xd6, 0xa6, 0xdc, 0x07,
-	0xe4, 0x74, 0xdc, 0x42, 0xae, 0x90, 0x4a, 0xe4, 0x32, 0xee, 0x03, 0x72, 0x46, 0xa8, 0x91, 0x2b,
-	0xd9, 0x8b, 0x90, 0x4d, 0xb9, 0x0f, 0xc8, 0xb9, 0xf6, 0x88, 0x9c, 0x6b, 0x2f, 0x42, 0xf6, 0x22,
-	0xf7, 0x01, 0x39, 0xc7, 0xbe, 0xd4, 0xbf, 0x42, 0x6e, 0xc6, 0x7d, 0x40, 0x4e, 0x87, 0x0b, 0xe4,
-	0x8a, 0x05, 0x20, 0x72, 0x73, 0xee, 0x03, 0x72, 0xc6, 0xde, 0x20, 0x57, 0x1c, 0x49, 0x89, 0x5c,
-	0xce, 0x7d, 0x40, 0xce, 0x9c, 0x49, 0x8d, 0x9c, 0x91, 0x69, 0xe4, 0x16, 0xdc, 0xbf, 0x14, 0x72,
-	0xba, 0x90, 0x85, 0x9c, 0x0e, 0x21, 0x72, 0x0f, 0xb8, 0x7f, 0x11, 0xe4, 0x22, 0x95, 0xac, 0x90,
-	0x73, 0x6a, 0xd1, 0xc7, 0xa1, 0xf8, 0x34, 0x89, 0x73, 0x8d, 0xdc, 0xf7, 0x3c, 0x5e, 0x45, 0xe6,
-	0x30, 0x2a, 0x99, 0x8b, 0x2c, 0x95, 0x64, 0xee, 0xfb, 0xa0, 0xba, 0x04, 0x74, 0x58, 0x43, 0x42,
-	0xf7, 0x16, 0xd8, 0x59, 0x55, 0x13, 0x19, 0xf9, 0x01, 0x14, 0x95, 0xd4, 0x61, 0x18, 0xa9, 0x0b,
-	0xe0, 0xa3, 0x52, 0x3a, 0x45, 0xdd, 0x0f, 0x41, 0x28, 0xb1, 0xc3, 0xb8, 0xc2, 0xce, 0x56, 0x2a,
-	0xec, 0x7e, 0x04, 0xca, 0x56, 0xa1, 0x54, 0xdc, 0x95, 0xbc, 0x45, 0xc8, 0x7e, 0x0c, 0xc2, 0xaa,
-	0xe3, 0x2d, 0xc2, 0x25, 0x6f, 0x11, 0xb2, 0x9f, 0x80, 0x90, 0xba, 0xde, 0x25, 0xa5, 0x22, 0xef,
-	0xa7, 0xa0, 0xac, 0xb9, 0xde, 0x22, 0xa4, 0x37, 0xe1, 0xec, 0xeb, 0x9a, 0x1a, 0xa7, 0x9f, 0x81,
-	0x56, 0xb2, 0xa7, 0xaa, 0x6a, 0xf6, 0xde, 0x4a, 0x4c, 0xcc, 0xb0, 0xf7, 0x73, 0x10, 0x4b, 0xf8,
-	0xf0, 0x0d, 0x0d, 0x9f, 0xdd, 0x15, 0xc2, 0xf7, 0x0b, 0x50, 0xfa, 0x45, 0x57, 0x48, 0xdf, 0xf2,
-	0x0a, 0x44, 0xc8, 0x7e, 0x09, 0xd2, 0x4e, 0x79, 0x05, 0x22, 0x5c, 0x5e, 0x81, 0x08, 0xd9, 0xaf,
-	0x40, 0xbc, 0x52, 0x5a, 0x41, 0x69, 0x17, 0x14, 0x7f, 0xbf, 0x06, 0xa9, 0x57, 0xec, 0x82, 0x02,
-	0xd0, 0xd9, 0x59, 0x04, 0xf0, 0x37, 0xa0, 0x6c, 0x58, 0x3b, 0x8b, 0x04, 0xda, 0x5d, 0x21, 0x81,
-	0xbf, 0x05, 0x61, 0xb3, 0xe8, 0x0a, 0x11, 0x7c, 0xce, 0x5a, 0xa7, 0x46, 0xf0, 0x15, 0x50, 0x5e,
-	0x8e, 0x41, 0xac, 0xa4, 0x19, 0xfc, 0x48, 0x01, 0x00, 0x32, 0xf8, 0x2a, 0x54, 0xbe, 0x10, 0x84,
-	0x98, 0x6d, 0x20, 0xb4, 0x8a, 0xd1, 0x80, 0x34, 0x4f, 0x92, 0x41, 0xbc, 0x18, 0xe7, 0xc8, 0xe0,
-	0xe7, 0xe0, 0x16, 0xb9, 0xd6, 0xaf, 0xe5, 0xb3, 0x45, 0x12, 0xad, 0xab, 0xb7, 0x24, 0x88, 0xf7,
-	0x0b, 0xa5, 0xe4, 0xf0, 0xf3, 0x97, 0xb8, 0x6f, 0xf6, 0xab, 0xf7, 0xee, 0xee, 0x99, 0xb2, 0x92,
-	0xc5, 0x27, 0x48, 0x4b, 0x97, 0x45, 0x6e, 0xbe, 0x00, 0x75, 0xeb, 0x7d, 0x6f, 0x27, 0xd2, 0x7e,
-	0x08, 0xe3, 0x75, 0xb2, 0xa1, 0x85, 0x8a, 0xc5, 0x2f, 0x82, 0x72, 0x13, 0x94, 0xba, 0x84, 0xa2,
-	0xd1, 0x92, 0x2a, 0x18, 0xbf, 0x04, 0xd2, 0x96, 0x2d, 0xbd, 0xaf, 0xbf, 0x2f, 0x6d, 0x7b, 0x11,
-	0xb2, 0x2f, 0x83, 0xb2, 0x5a, 0xb2, 0x97, 0x5f, 0x05, 0x8e, 0xbd, 0x08, 0xd9, 0x57, 0x40, 0x49,
-	0xcb, 0xf6, 0xae, 0x54, 0xf1, 0xf8, 0x55, 0x90, 0xd6, 0xca, 0xf6, 0x22, 0xa4, 0xb7, 0x48, 0xc7,
-	0x54, 0xd5, 0x8c, 0x7d, 0x0d, 0xc4, 0x6d, 0x10, 0xb7, 0x75, 0x5d, 0x8d, 0xe4, 0x0d, 0xa2, 0x43,
-	0x86, 0xc8, 0xaf, 0x83, 0x7a, 0x15, 0xd4, 0xda, 0xf4, 0x8e, 0xe1, 0xd7, 0xb4, 0x86, 0x48, 0x7e,
-	0x03, 0xa4, 0x7e, 0xbf, 0x76, 0x7b, 0x7b, 0x27, 0x34, 0xdd, 0x21, 0x97, 0x4b, 0xeb, 0x10, 0x21,
-	0xfb, 0x26, 0xc8, 0x3b, 0xcb, 0xeb, 0x90, 0xdf, 0xe1, 0xee, 0x3a, 0x44, 0xc8, 0xbe, 0x05, 0xea,
-	0x95, 0xa5, 0x75, 0x88, 0x90, 0x6e, 0x17, 0xdb, 0xa1, 0xc0, 0xfc, 0x36, 0x68, 0xbd, 0xfe, 0x0a,
-	0x2c, 0x64, 0xe7, 0x49, 0xb3, 0x27, 0x8a, 0xcf, 0x1b, 0xd6, 0x4e, 0x23, 0x9e, 0xdf, 0x01, 0x7d,
-	0xa3, 0x5f, 0x7d, 0xe9, 0xe6, 0x69, 0xb1, 0xd7, 0x88, 0xe8, 0xf5, 0xa2, 0x49, 0x24, 0xf4, 0x65,
-	0xd0, 0x36, 0x51, 0xab, 0x7b, 0x44, 0x4a, 0x77, 0xc8, 0x96, 0x96, 0x7e, 0x2c, 0x99, 0x65, 0xba,
-	0xf8, 0xeb, 0x58, 0xbc, 0x12, 0x6d, 0xaa, 0x77, 0x0f, 0x92, 0x59, 0xa6, 0xaa, 0x77, 0x09, 0x75,
-	0x52, 0xd0, 0xe2, 0x11, 0x5a, 0x54, 0xa2, 0x8e, 0x95, 0x81, 0x1e, 0x4f, 0x91, 0xc7, 0x9c, 0x3d,
-	0x3f, 0x4c, 0x93, 0xe1, 0x28, 0x1d, 0xb0, 0x8f, 0x57, 0x71, 0xeb, 0x6f, 0x8d, 0xd2, 0x41, 0x44,
-	0xed, 0xad, 0xbf, 0x2b, 0x05, 0x54, 0x94, 0x13, 0xa7, 0xd9, 0x1c, 0x12, 0x3f, 0x81, 0x89, 0xd5,
-	0xa5, 0xbc, 0x0f, 0xc8, 0xf7, 0xe9, 0xdb, 0xc8, 0x66, 0xc9, 0x30, 0x4e, 0xd9, 0x27, 0x55, 0x52,
-	0x1a, 0xa7, 0xe6, 0xb3, 0x43, 0xb3, 0x38, 0xa5, 0xcf, 0x90, 0x2b, 0xee, 0xc7, 0xa1, 0xd7, 0xf8,
-	0xa9, 0xaa, 0xfc, 0x54, 0x70, 0x8d, 0x5b, 0xce, 0x67, 0xa2, 0x16, 0xf9, 0xf4, 0x52, 0xaa, 0x5a,
-	0xe5, 0xa7, 0x31, 0xb5, 0xba, 0x9c, 0xa9, 0x96, 0xd9, 0x2b, 0x36, 0x52, 0x9b, 0xc6, 0x29, 0xfb,
-	0x8c, 0x4a, 0x83, 0x75, 0x76, 0x5c, 0xc3, 0x38, 0xa5, 0xc7, 0xa4, 0x3d, 0x89, 0xa7, 0x38, 0x15,
-	0x14, 0x9c, 0xff, 0xa9, 0xca, 0xa1, 0xda, 0x3f, 0xf7, 0x50, 0x8d, 0xa7, 0x72, 0x78, 0x48, 0x84,
-	0xf7, 0xd2, 0x7c, 0x76, 0x1a, 0xb5, 0x26, 0x76, 0x8c, 0x8e, 0x09, 0x05, 0x13, 0x3c, 0x0b, 0x87,
-	0x13, 0x35, 0xbc, 0xff, 0x8b, 0x3e, 0xef, 0xb8, 0x80, 0x0f, 0x9e, 0x18, 0x15, 0x40, 0xab, 0xce,
-	0xa4, 0x14, 0xa6, 0x03, 0x02, 0x31, 0xcd, 0x0c, 0xce, 0xd1, 0xff, 0xa1, 0xd7, 0xdb, 0x2f, 0xe0,
-	0xa5, 0xc8, 0x82, 0xf9, 0x89, 0x4e, 0x1b, 0x13, 0x27, 0x48, 0x39, 0x21, 0x59, 0x9a, 0x64, 0x03,
-	0x9c, 0xe9, 0xaf, 0xc0, 0xaf, 0xf3, 0xb5, 0xfd, 0x4a, 0xd4, 0x90, 0x41, 0x39, 0xcd, 0xef, 0x6a,
-	0x85, 0x5c, 0xc3, 0xab, 0xb5, 0x8b, 0xcf, 0x72, 0x53, 0x4f, 0x3a, 0x5e, 0x23, 0xeb, 0x58, 0x0f,
-	0xe7, 0xed, 0x6b, 0x50, 0xb0, 0xbe, 0x5f, 0x89, 0xd0, 0x05, 0x27, 0xf8, 0xe3, 0xa4, 0x89, 0x1a,
-	0x35, 0xbf, 0x7f, 0x27, 0x9f, 0x1a, 0xec, 0x57, 0x22, 0x4c, 0x55, 0xc3, 0xdb, 0xa8, 0xd4, 0xe8,
-	0xfe, 0x3d, 0xa8, 0x5a, 0x46, 0xa5, 0xe6, 0xb6, 0xed, 0x27, 0x42, 0xf6, 0x3a, 0x88, 0xaa, 0xb6,
-	0x9f, 0x08, 0x5d, 0x3f, 0x11, 0xb2, 0x47, 0x20, 0xa2, 0x8e, 0x9f, 0xad, 0x52, 0xb3, 0xfa, 0x0f,
-	0xa0, 0xaa, 0x39, 0x7e, 0xf2, 0x7a, 0xb1, 0xa1, 0x6a, 0xe9, 0xc1, 0xfb, 0x47, 0xd0, 0xb5, 0xf7,
-	0x2b, 0x51, 0x0b, 0xab, 0x0d, 0xcc, 0x55, 0x08, 0x03, 0x66, 0x42, 0xff, 0x09, 0x84, 0xab, 0xfb,
-	0x95, 0x08, 0x7d, 0xf4, 0x78, 0x36, 0x1d, 0xe0, 0x70, 0xfe, 0x33, 0xa8, 0x7c, 0xd3, 0x01, 0x8e,
-	0xe5, 0x92, 0xab, 0x08, 0xd9, 0x5f, 0x40, 0xd6, 0x29, 0xb9, 0x8a, 0xb0, 0xe4, 0x2a, 0x42, 0xf6,
-	0x57, 0x10, 0xae, 0xb8, 0xae, 0x76, 0xb7, 0x6a, 0x14, 0xff, 0x0d, 0x64, 0x9e, 0xe9, 0x56, 0x8d,
-	0xe0, 0x62, 0xe7, 0x70, 0x46, 0xfe, 0x1d, 0x54, 0x8d, 0x62, 0xe7, 0x70, 0x3a, 0x9a, 0x0e, 0x70,
-	0x2c, 0xfe, 0x03, 0x44, 0x4d, 0xd3, 0x01, 0x0e, 0xc4, 0x0f, 0xeb, 0x75, 0xe9, 0x7b, 0xd1, 0x3f,
-	0x6b, 0x97, 0x7a, 0x1c, 0x60, 0x1a, 0xd1, 0x28, 0xdd, 0x57, 0x07, 0x18, 0xef, 0x44, 0xff, 0xaa,
-	0xc9, 0x67, 0x01, 0xbd, 0x73, 0x3f, 0x0b, 0x80, 0x54, 0x79, 0x21, 0x32, 0xeb, 0xc5, 0xfb, 0xd0,
-	0x1b, 0x75, 0x4f, 0xf9, 0xc3, 0xec, 0x70, 0x87, 0xbd, 0x5c, 0x97, 0xe7, 0xd8, 0x53, 0x47, 0xfd,
-	0xd9, 0x87, 0xd9, 0x8e, 0x2b, 0xe9, 0xb1, 0xef, 0xd6, 0xe5, 0xd1, 0xb3, 0x24, 0xbd, 0xab, 0x82,
-	0xb4, 0x9c, 0xa7, 0x0d, 0xce, 0xe3, 0x13, 0x5c, 0xf1, 0x96, 0x7c, 0xcc, 0x62, 0x9e, 0x42, 0x48,
-	0x19, 0xe4, 0x39, 0x3f, 0x99, 0x9c, 0xdf, 0x80, 0x98, 0xf7, 0x50, 0xfe, 0x56, 0x34, 0x3f, 0xa5,
-	0x30, 0xef, 0x29, 0xc8, 0xb3, 0x6e, 0x79, 0xce, 0xcd, 0x15, 0xf3, 0x5e, 0xc3, 0x2b, 0xae, 0xb9,
-	0xfe, 0x61, 0xe2, 0xbb, 0x08, 0x5d, 0x9e, 0x91, 0xb4, 0x43, 0xaa, 0x2f, 0x24, 0xa7, 0xf2, 0xa9,
-	0x63, 0x3d, 0x82, 0x7f, 0xe9, 0x63, 0xa4, 0xfe, 0x20, 0x1e, 0x2f, 0x12, 0xf9, 0x90, 0xb1, 0x1a,
-	0xe1, 0x8b, 0xbe, 0xff, 0xb4, 0x77, 0x35, 0x27, 0x57, 0xce, 0x9c, 0x7e, 0x76, 0x91, 0x06, 0x16,
-	0xd9, 0xb3, 0x8b, 0x5c, 0xe2, 0x6a, 0x6c, 0xb9, 0x66, 0x64, 0xeb, 0x8c, 0x39, 0x68, 0x7b, 0xae,
-	0xa0, 0xe7, 0xae, 0xed, 0x79, 0xd1, 0x5f, 0x8d, 0x96, 0xe1, 0x33, 0x84, 0x14, 0x67, 0x46, 0x3e,
-	0xb7, 0x93, 0x47, 0x40, 0xee, 0xed, 0xa1, 0x7c, 0xd0, 0xcb, 0xfe, 0x2d, 0x21, 0x89, 0xda, 0x99,
-	0xd1, 0xc9, 0xaa, 0x57, 0x1b, 0x64, 0x55, 0x55, 0xbd, 0xf6, 0x06, 0x52, 0x93, 0xd3, 0x72, 0x8d,
-	0xd4, 0x0e, 0xf6, 0xa2, 0x7b, 0x9d, 0x0a, 0x5d, 0x25, 0x70, 0x25, 0xee, 0x78, 0xbb, 0x2d, 0x33,
-	0x0e, 0x20, 0x69, 0x77, 0x9d, 0x34, 0xcc, 0x21, 0xdb, 0x7d, 0xf7, 0xc1, 0x3b, 0x87, 0xa3, 0xfc,
-	0xf9, 0xc5, 0xd1, 0xf6, 0x71, 0x36, 0xe9, 0x0e, 0xb3, 0x71, 0x9c, 0x0e, 0xbb, 0x72, 0xe5, 0x47,
-	0x8b, 0x41, 0xf7, 0x41, 0xaf, 0x7b, 0x3c, 0x39, 0xc1, 0xd7, 0xc7, 0xb7, 0x86, 0x49, 0x7a, 0x6b,
-	0x98, 0x75, 0xf3, 0x64, 0x9e, 0x9f, 0xc4, 0x79, 0x8c, 0xe1, 0xde, 0xff, 0x03, 0x00, 0x00, 0xff,
-	0xff, 0xd7, 0xb7, 0x5b, 0x69, 0x94, 0x16, 0x00, 0x00,
+	0x20, 0xb3, 0xec, 0xae, 0x15, 0x6b, 0x27, 0x9d, 0x44, 0x14, 0x05, 0xb8, 0xf0, 0x62, 0xaa, 0x60,
+	0x17, 0x86, 0xdd, 0xa2, 0x6a, 0x43, 0x95, 0x6b, 0x6c, 0x8f, 0x14, 0x11, 0x69, 0x46, 0x91, 0x46,
+	0xbb, 0x59, 0x3e, 0x05, 0xd7, 0x8f, 0xc1, 0xfd, 0x0e, 0xe1, 0x03, 0x70, 0xbf, 0x85, 0x4b, 0x12,
+	0xc8, 0x72, 0xbf, 0xbe, 0x02, 0xaf, 0x4b, 0x9d, 0x3e, 0xdd, 0x3d, 0xdd, 0x23, 0x3f, 0xd8, 0x7e,
+	0xb2, 0x75, 0xf4, 0x3f, 0xe7, 0xdf, 0xa7, 0xd5, 0xbf, 0xa3, 0xd6, 0x90, 0xad, 0xe9, 0x2c, 0xcb,
+	0xb3, 0x5e, 0x77, 0x30, 0x4a, 0xc6, 0xc7, 0xf3, 0x6d, 0xf9, 0x8a, 0x5e, 0x18, 0x66, 0xf2, 0x1f,
+	0x7c, 0x79, 0x84, 0x7f, 0x7a, 0x97, 0x5e, 0xb9, 0x4a, 0x3a, 0x37, 0x40, 0x77, 0x3b, 0x99, 0xe7,
+	0x1f, 0x4c, 0xe6, 0xf3, 0x78, 0x98, 0xd0, 0xb7, 0x90, 0x56, 0x36, 0xcd, 0x47, 0x59, 0x1a, 0x8f,
+	0x0f, 0x0e, 0xb3, 0x6c, 0xcc, 0x3c, 0xee, 0x05, 0x6b, 0x51, 0x53, 0x07, 0x77, 0xb3, 0x6c, 0x4c,
+	0x3f, 0x6c, 0x89, 0x92, 0x74, 0x31, 0x61, 0x3e, 0xf7, 0x82, 0x8d, 0xde, 0xd5, 0xed, 0x13, 0x8d,
+	0xb6, 0xcb, 0x26, 0xdb, 0x7b, 0xe9, 0x62, 0x52, 0x94, 0x84, 0x57, 0xf4, 0xad, 0x64, 0xc3, 0x94,
+	0x1c, 0xa5, 0xf9, 0xf5, 0x1e, 0xab, 0x72, 0x2f, 0xa8, 0x47, 0xc6, 0xe8, 0xfd, 0x10, 0xa4, 0x4f,
+	0x90, 0xb6, 0x91, 0xcd, 0x51, 0x57, 0xe3, 0x5e, 0xb0, 0x19, 0x99, 0xec, 0x8f, 0x8c, 0x96, 0x84,
+	0x0b, 0x14, 0xd6, 0xb9, 0x17, 0xb4, 0x0a, 0xe1, 0x1d, 0x14, 0x96, 0x8c, 0x45, 0xc8, 0x56, 0xb8,
+	0x17, 0x54, 0x1d, 0x63, 0x11, 0x2e, 0x19, 0x8b, 0x90, 0xad, 0x72, 0x2f, 0xa0, 0xae, 0x71, 0x49,
+	0xb8, 0x40, 0xe1, 0x1a, 0xf7, 0x82, 0x9a, 0x6b, 0x2c, 0x42, 0x7a, 0x85, 0x6c, 0x16, 0x15, 0x07,
+	0xa3, 0x97, 0x92, 0xe3, 0xeb, 0x3d, 0xd6, 0xe0, 0x5e, 0xd0, 0x8e, 0x3a, 0xa6, 0xa6, 0x8a, 0xd3,
+	0xcb, 0xc4, 0xc4, 0x0e, 0xb4, 0x96, 0x70, 0x2f, 0x58, 0x8d, 0x8c, 0xdb, 0x0d, 0x25, 0xb5, 0x1b,
+	0x1a, 0x8c, 0xb3, 0x38, 0x67, 0xeb, 0xdc, 0x0b, 0xfc, 0xa2, 0xa1, 0x1b, 0x10, 0x3c, 0xc1, 0x5e,
+	0x84, 0xac, 0xc9, 0xbd, 0xa0, 0x53, 0xb6, 0x17, 0xe1, 0xb2, 0xbd, 0x08, 0x59, 0x8b, 0x7b, 0xc1,
+	0x4a, 0xc9, 0xbe, 0xd4, 0xff, 0x71, 0xb6, 0x38, 0x1c, 0x27, 0x6c, 0x83, 0x7b, 0x81, 0x57, 0xf4,
+	0xff, 0x5e, 0x19, 0x75, 0x77, 0x34, 0x9f, 0x8d, 0xd2, 0x21, 0x6b, 0x73, 0x2f, 0x68, 0x58, 0x3b,
+	0x2a, 0xa3, 0x4e, 0x43, 0x87, 0x0f, 0xf2, 0x64, 0xce, 0x3a, 0xdc, 0x0b, 0x9a, 0x45, 0x43, 0xbb,
+	0x10, 0xa4, 0x77, 0xad, 0x35, 0xaa, 0x83, 0xc6, 0x36, 0xb9, 0x17, 0xac, 0xf7, 0xba, 0xa7, 0x3d,
+	0x97, 0xea, 0x6f, 0xd1, 0x94, 0xa6, 0xe2, 0xb9, 0xe2, 0xc0, 0x0f, 0x67, 0xd9, 0x62, 0xca, 0x28,
+	0xf7, 0x02, 0xd2, 0x7b, 0xea, 0xb4, 0x85, 0x6f, 0xa9, 0xe4, 0xf7, 0x41, 0x72, 0xe4, 0xd6, 0x02,
+	0xe4, 0x66, 0xc9, 0x8b, 0x8b, 0xd1, 0x2c, 0x39, 0x46, 0xe4, 0x12, 0xee, 0x03, 0x72, 0x3a, 0xa8,
+	0x91, 0x33, 0x22, 0x89, 0xdc, 0x80, 0xfb, 0x67, 0x47, 0x4e, 0x97, 0xd0, 0xc8, 0x99, 0x92, 0x48,
+	0xc8, 0x90, 0xfb, 0x80, 0x9c, 0x8e, 0x1a, 0xe4, 0x8c, 0x4c, 0x21, 0xf7, 0x3c, 0xf7, 0x01, 0x39,
+	0x1d, 0x2e, 0x90, 0x33, 0x42, 0x85, 0xdc, 0x88, 0xfb, 0x80, 0x9c, 0x0e, 0x17, 0xc8, 0xd9, 0xc6,
+	0x22, 0x64, 0x1f, 0xe7, 0x3e, 0x20, 0x67, 0x19, 0xe3, 0x49, 0x72, 0x8c, 0x45, 0xc8, 0x5e, 0xe0,
+	0x3e, 0x20, 0x67, 0x1b, 0x97, 0x84, 0x0a, 0xb9, 0x31, 0xf7, 0x01, 0x39, 0xdb, 0x18, 0x91, 0x2b,
+	0x2a, 0x6a, 0x8c, 0x26, 0xdc, 0x07, 0xe4, 0x4c, 0x4d, 0x0b, 0x39, 0x23, 0xd6, 0xda, 0x94, 0xfb,
+	0x80, 0x9c, 0x8e, 0x5b, 0xc8, 0x15, 0x52, 0x89, 0x5c, 0xc6, 0x7d, 0x40, 0xce, 0x08, 0x35, 0x72,
+	0x25, 0x7b, 0x11, 0xb2, 0x29, 0xf7, 0x01, 0x39, 0xd7, 0x1e, 0x91, 0x73, 0xed, 0x45, 0xc8, 0x5e,
+	0xe4, 0x3e, 0x20, 0xe7, 0xd8, 0x97, 0xfa, 0x57, 0xc8, 0xcd, 0xb8, 0x0f, 0xc8, 0xe9, 0x70, 0x81,
+	0x5c, 0xb1, 0x00, 0x44, 0x6e, 0xce, 0x7d, 0x40, 0xce, 0xd8, 0x1b, 0xe4, 0x8a, 0x23, 0x29, 0x91,
+	0xcb, 0xb9, 0x0f, 0xc8, 0x99, 0x33, 0xa9, 0x91, 0x33, 0x32, 0x8d, 0xdc, 0x82, 0xfb, 0xe7, 0x42,
+	0x4e, 0x17, 0xb2, 0x90, 0xd3, 0x21, 0x44, 0xee, 0x1e, 0xf7, 0xcf, 0x82, 0x5c, 0xa4, 0x92, 0x15,
+	0x72, 0x4e, 0x2d, 0xfa, 0x38, 0x14, 0x9f, 0x26, 0x71, 0xae, 0x91, 0xfb, 0xbe, 0xc7, 0xab, 0xc8,
+	0x1c, 0x46, 0x25, 0x73, 0x91, 0xa5, 0x92, 0xcc, 0xfd, 0x00, 0x54, 0xe7, 0x80, 0x0e, 0x6b, 0x48,
+	0xe8, 0xde, 0x06, 0x3b, 0xab, 0x6a, 0x22, 0x23, 0x3f, 0x84, 0xa2, 0x92, 0x3a, 0x0c, 0x23, 0x75,
+	0x01, 0x7c, 0x54, 0x4a, 0xa7, 0xa8, 0xfb, 0x11, 0x08, 0x25, 0x76, 0x18, 0x57, 0xd8, 0xd9, 0x4a,
+	0x85, 0xdd, 0x8f, 0x41, 0xd9, 0x2a, 0x94, 0x8a, 0xbb, 0x92, 0xb7, 0x08, 0xd9, 0x4f, 0x40, 0x58,
+	0x75, 0xbc, 0x45, 0xb8, 0xe4, 0x2d, 0x42, 0xf6, 0x53, 0x10, 0x52, 0xd7, 0xbb, 0xa4, 0x54, 0xe4,
+	0xfd, 0x0c, 0x94, 0x35, 0xd7, 0x5b, 0x84, 0xf4, 0x2a, 0x9c, 0x7d, 0x5d, 0x53, 0xe3, 0xf4, 0x73,
+	0xd0, 0x4a, 0xf6, 0x54, 0x55, 0xcd, 0xde, 0xdb, 0x89, 0x89, 0x19, 0xf6, 0x7e, 0x01, 0x62, 0x09,
+	0x1f, 0xbe, 0xa1, 0xe1, 0xb3, 0xbb, 0x42, 0xf8, 0x7e, 0x09, 0x4a, 0xbf, 0xe8, 0x0a, 0xe9, 0x5b,
+	0x5e, 0x81, 0x08, 0xd9, 0x2b, 0x20, 0xed, 0x94, 0x57, 0x20, 0xc2, 0xe5, 0x15, 0x88, 0x90, 0xfd,
+	0x0a, 0xc4, 0x2b, 0xa5, 0x15, 0x94, 0x76, 0x41, 0xf1, 0xf7, 0x6b, 0x90, 0x7a, 0xc5, 0x2e, 0x28,
+	0x00, 0x9d, 0x9d, 0x45, 0x00, 0x7f, 0x03, 0xca, 0x86, 0xb5, 0xb3, 0x48, 0xa0, 0xdd, 0x15, 0x12,
+	0xf8, 0x5b, 0x10, 0x36, 0x8b, 0xae, 0x10, 0xc1, 0xe7, 0xac, 0x75, 0x6a, 0x04, 0x5f, 0x05, 0xe5,
+	0xf9, 0x18, 0xc4, 0x4a, 0x9a, 0xc1, 0x8f, 0x15, 0x00, 0x20, 0x83, 0xaf, 0x41, 0xe5, 0x33, 0x41,
+	0x88, 0xd9, 0x06, 0x42, 0xab, 0x18, 0x0d, 0x48, 0xf3, 0x38, 0x19, 0xc4, 0x8b, 0x71, 0x8e, 0x0c,
+	0x7e, 0x1e, 0x6e, 0x91, 0x6b, 0xfd, 0x5a, 0x3e, 0x5b, 0x24, 0xd1, 0xba, 0x7a, 0x4b, 0x82, 0x78,
+	0xa7, 0x50, 0x4a, 0x0e, 0xbf, 0x70, 0x8e, 0xfb, 0x66, 0xbf, 0x7a, 0xeb, 0xe6, 0x9e, 0x29, 0x2b,
+	0x59, 0x7c, 0x82, 0xb4, 0x74, 0x59, 0xe4, 0xe6, 0x8b, 0x50, 0xb7, 0xde, 0xf7, 0x76, 0x22, 0xed,
+	0x87, 0x30, 0x5e, 0x26, 0x1b, 0x5a, 0xa8, 0x58, 0xfc, 0x12, 0x28, 0x37, 0x41, 0xa9, 0x4b, 0x28,
+	0x1a, 0x2d, 0xa9, 0x82, 0xf1, 0xcb, 0x20, 0x6d, 0xd9, 0xd2, 0x3b, 0xfa, 0xfb, 0xd2, 0xb6, 0x17,
+	0x21, 0xfb, 0x0a, 0x28, 0xab, 0x25, 0x7b, 0xf9, 0x55, 0xe0, 0xd8, 0x8b, 0x90, 0x7d, 0x15, 0x94,
+	0xb4, 0x6c, 0xef, 0x4a, 0x15, 0x8f, 0x5f, 0x03, 0x69, 0xad, 0x6c, 0x2f, 0x42, 0x7a, 0x8d, 0x74,
+	0x4c, 0x55, 0xcd, 0xd8, 0xd7, 0x41, 0xdc, 0x06, 0x71, 0x5b, 0xd7, 0xd5, 0x48, 0x5e, 0x21, 0x3a,
+	0x64, 0x88, 0xfc, 0x06, 0xa8, 0x57, 0x41, 0xad, 0x4d, 0x6f, 0x18, 0x7e, 0x4d, 0x6b, 0x88, 0xe4,
+	0x37, 0x41, 0xea, 0xf7, 0x6b, 0xd7, 0xb7, 0x77, 0x42, 0xd3, 0x1d, 0x72, 0xb9, 0xb4, 0x0e, 0x11,
+	0xb2, 0x6f, 0x81, 0xbc, 0xb3, 0xbc, 0x0e, 0xf9, 0x1d, 0xee, 0xae, 0x43, 0x84, 0xec, 0xdb, 0xa0,
+	0x5e, 0x59, 0x5a, 0x87, 0x08, 0xe9, 0x76, 0xb1, 0x1d, 0x0a, 0xcc, 0xef, 0x80, 0xd6, 0xeb, 0xaf,
+	0xc0, 0x42, 0x76, 0x9e, 0x32, 0x7b, 0xa2, 0xf8, 0xbc, 0x62, 0xed, 0x34, 0xe2, 0xf9, 0x5d, 0xd0,
+	0x37, 0xfa, 0xd5, 0x97, 0xae, 0x3e, 0x28, 0xf6, 0x1a, 0x11, 0xbd, 0x5c, 0x34, 0x89, 0x84, 0xbe,
+	0x0c, 0xda, 0x26, 0x6a, 0x75, 0x8f, 0x48, 0xe9, 0x0e, 0xd9, 0xd2, 0xd2, 0x4f, 0x24, 0xb3, 0x4c,
+	0x17, 0x7f, 0x03, 0x8b, 0x57, 0xa2, 0x4d, 0xf5, 0xee, 0xdd, 0x64, 0x96, 0xa9, 0xea, 0x5d, 0x42,
+	0x9d, 0x14, 0xb4, 0x78, 0x88, 0x16, 0x95, 0xa8, 0x63, 0x65, 0xa0, 0xc7, 0xd3, 0xe4, 0x31, 0x67,
+	0xcf, 0x0f, 0xd2, 0x64, 0x38, 0x4a, 0x07, 0xec, 0x93, 0x55, 0xdc, 0xfa, 0x6b, 0xa3, 0x74, 0x10,
+	0x51, 0x7b, 0xeb, 0x6f, 0x4a, 0x01, 0x15, 0xe5, 0xc4, 0x69, 0x36, 0x87, 0xc4, 0x4f, 0x61, 0x62,
+	0x75, 0x29, 0xef, 0x43, 0xf2, 0x7d, 0xfa, 0x24, 0xd9, 0x2c, 0x19, 0xc6, 0x29, 0xfb, 0xb4, 0x4a,
+	0x4a, 0xe3, 0xd4, 0x7c, 0x76, 0x68, 0x16, 0xa7, 0xf4, 0x59, 0x72, 0xc1, 0xfd, 0x38, 0xf4, 0x1a,
+	0x3f, 0x53, 0x95, 0x9f, 0x0a, 0xae, 0x71, 0xcb, 0xf9, 0x4c, 0xd4, 0x22, 0x9f, 0x59, 0x4a, 0x55,
+	0xab, 0xfc, 0x2c, 0xa6, 0x56, 0x97, 0x33, 0xd5, 0x32, 0x7b, 0xc5, 0x46, 0x6a, 0xd3, 0x38, 0x65,
+	0x9f, 0x53, 0x69, 0xb0, 0xce, 0x8e, 0x6b, 0x18, 0xa7, 0xf4, 0x88, 0xb4, 0x27, 0xf1, 0x14, 0xa7,
+	0x82, 0x82, 0xf3, 0x3f, 0x55, 0x39, 0x54, 0xfb, 0xa7, 0x1e, 0xaa, 0xf1, 0x54, 0x0e, 0x0f, 0x89,
+	0xf0, 0x5e, 0x9a, 0xcf, 0x1e, 0x44, 0xad, 0x89, 0x1d, 0xa3, 0x63, 0x42, 0xc1, 0x04, 0xcf, 0xc2,
+	0xc1, 0x44, 0x0d, 0xef, 0xff, 0xa2, 0xcf, 0x3b, 0xcf, 0xe0, 0x83, 0x27, 0x46, 0x05, 0xd0, 0xaa,
+	0x33, 0x29, 0x85, 0xe9, 0x80, 0x40, 0x4c, 0x33, 0x83, 0x73, 0xf4, 0x7f, 0xe8, 0xf5, 0x8e, 0x33,
+	0x78, 0x29, 0xb2, 0x60, 0x7e, 0xa2, 0xd3, 0xc6, 0xc4, 0x09, 0x52, 0x4e, 0x48, 0x96, 0x26, 0xd9,
+	0x00, 0x67, 0xfa, 0xab, 0xf0, 0xeb, 0x7c, 0x6d, 0xbf, 0x12, 0x35, 0x64, 0x50, 0x4e, 0xf3, 0x9b,
+	0x5a, 0x21, 0xd7, 0xf0, 0x5a, 0xed, 0xec, 0xb3, 0xdc, 0xd4, 0x93, 0x8e, 0x97, 0xc8, 0x3a, 0xd6,
+	0xc3, 0x79, 0xfb, 0x3a, 0x14, 0xac, 0xef, 0x57, 0x22, 0x74, 0xc1, 0x09, 0xfe, 0x38, 0x69, 0xa2,
+	0x46, 0xcd, 0xef, 0xdf, 0xc9, 0xa7, 0x06, 0xfb, 0x95, 0x08, 0x53, 0xd5, 0xf0, 0x36, 0x2a, 0x35,
+	0xba, 0x7f, 0x0f, 0xaa, 0x96, 0x51, 0xa9, 0xb9, 0x6d, 0xfb, 0x89, 0x90, 0xbd, 0x01, 0xa2, 0xaa,
+	0xed, 0x27, 0x42, 0xd7, 0x4f, 0x84, 0xec, 0x21, 0x88, 0xa8, 0xe3, 0x67, 0xab, 0xd4, 0xac, 0xfe,
+	0x03, 0xa8, 0x6a, 0x8e, 0x9f, 0xbc, 0x5e, 0x6c, 0xa8, 0x5a, 0x7a, 0xf0, 0xfe, 0x11, 0x74, 0xed,
+	0xfd, 0x4a, 0xd4, 0xc2, 0x6a, 0x03, 0x73, 0x15, 0xc2, 0x80, 0x99, 0xd0, 0x7f, 0x02, 0xe1, 0xea,
+	0x7e, 0x25, 0x42, 0x1f, 0x3d, 0x9e, 0x4d, 0x07, 0x38, 0x9c, 0xff, 0x0c, 0x2a, 0xdf, 0x74, 0x80,
+	0x63, 0xb9, 0xe4, 0x2a, 0x42, 0xf6, 0x17, 0x90, 0x75, 0x4a, 0xae, 0x22, 0x2c, 0xb9, 0x8a, 0x90,
+	0xfd, 0x15, 0x84, 0x2b, 0xae, 0xab, 0xdd, 0xad, 0x1a, 0xc5, 0x7f, 0x03, 0x99, 0x67, 0xba, 0x55,
+	0x23, 0xb8, 0xd8, 0x39, 0x9c, 0x91, 0x7f, 0x07, 0x55, 0xa3, 0xd8, 0x39, 0x9c, 0x8e, 0xa6, 0x03,
+	0x1c, 0x8b, 0xff, 0x00, 0x51, 0xd3, 0x74, 0x80, 0x03, 0xf1, 0xa3, 0x7a, 0x5d, 0xfa, 0x5e, 0xf4,
+	0xcf, 0xda, 0xb9, 0x1e, 0x07, 0x98, 0x46, 0x34, 0x4a, 0x77, 0xd4, 0x01, 0xc6, 0x3b, 0xd1, 0xbf,
+	0x6a, 0xf2, 0x59, 0x40, 0xef, 0xd4, 0xcf, 0x02, 0x20, 0x55, 0x5e, 0x88, 0xcc, 0x7a, 0xf1, 0x3e,
+	0xf4, 0x24, 0xd9, 0xc4, 0xf5, 0x8e, 0xe3, 0xd9, 0x30, 0x99, 0xe7, 0x07, 0x79, 0x3c, 0x64, 0x8f,
+	0x1e, 0x3d, 0x7a, 0xe4, 0xa9, 0x03, 0xdd, 0x96, 0x6f, 0x7f, 0x00, 0xdf, 0xbd, 0x1d, 0x0f, 0xe9,
+	0x9b, 0xf5, 0x2e, 0xe4, 0xf7, 0xb3, 0x83, 0x1d, 0xf6, 0x72, 0x5d, 0x0a, 0x3d, 0x05, 0xc7, 0xed,
+	0xfb, 0xd9, 0x8e, 0x2b, 0xe9, 0xb1, 0xef, 0xd5, 0xe5, 0x61, 0xb5, 0x24, 0xbd, 0x8b, 0x82, 0xb4,
+	0x9c, 0xe7, 0x13, 0xce, 0x03, 0x17, 0xec, 0x71, 0x4b, 0x3e, 0x98, 0x31, 0xcf, 0x2d, 0xa4, 0x0c,
+	0xf2, 0x9c, 0x1f, 0x59, 0xce, 0xaf, 0x46, 0xcc, 0xbb, 0x2f, 0x7f, 0x5d, 0x9a, 0x1f, 0x5f, 0x98,
+	0xf7, 0x34, 0xe4, 0x59, 0xf7, 0x42, 0xe7, 0xae, 0x8b, 0x79, 0xaf, 0xe3, 0xa5, 0xd8, 0x5c, 0x18,
+	0x31, 0xf1, 0xdd, 0x84, 0x2e, 0x4f, 0x55, 0xda, 0x21, 0xd5, 0x17, 0x92, 0x07, 0xf2, 0x39, 0x65,
+	0x3d, 0x82, 0x7f, 0xe9, 0x63, 0xa4, 0x7e, 0x2f, 0x1e, 0x2f, 0x12, 0xf9, 0x58, 0xb2, 0x1a, 0xe1,
+	0x8b, 0xbe, 0xff, 0x8c, 0x77, 0x31, 0x27, 0x17, 0x4e, 0x9c, 0x97, 0x76, 0x91, 0x06, 0x16, 0xd9,
+	0xb3, 0x8b, 0x9c, 0xe3, 0x32, 0x6d, 0xb9, 0x66, 0x64, 0xeb, 0x84, 0xc9, 0x69, 0x7b, 0xae, 0xa0,
+	0xe7, 0xae, 0xed, 0x79, 0xd6, 0xdf, 0x99, 0x96, 0xe1, 0xb3, 0x84, 0x14, 0xa7, 0x4c, 0x3e, 0xe9,
+	0x93, 0x47, 0x40, 0xee, 0xed, 0x81, 0x7c, 0x34, 0xcc, 0xfe, 0x2d, 0xb1, 0x52, 0x47, 0x4a, 0xea,
+	0x64, 0xd5, 0x8b, 0x0d, 0xb2, 0xaa, 0xaa, 0x5e, 0x7a, 0x13, 0xa9, 0xc9, 0xf9, 0xba, 0x46, 0x6a,
+	0x77, 0xf7, 0xa2, 0x5b, 0x9d, 0x0a, 0x5d, 0x25, 0x70, 0x89, 0xee, 0x78, 0xbb, 0x2d, 0x33, 0x40,
+	0x20, 0x69, 0x77, 0x9d, 0x34, 0xcc, 0x21, 0xdb, 0x7d, 0xcf, 0xdd, 0x77, 0x0d, 0x47, 0xf9, 0xf3,
+	0x8b, 0xc3, 0xed, 0xa3, 0x6c, 0xd2, 0x1d, 0x66, 0xe3, 0x38, 0x1d, 0x76, 0xe5, 0xca, 0x0f, 0x17,
+	0x83, 0xee, 0xbd, 0x5e, 0xf7, 0x68, 0x72, 0x8c, 0xaf, 0x8f, 0xae, 0x0d, 0x93, 0xf4, 0xda, 0x30,
+	0xeb, 0xe6, 0xc9, 0x3c, 0x3f, 0x8e, 0xf3, 0x18, 0xc3, 0xbd, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff,
+	0xf6, 0x65, 0x99, 0x4d, 0xc6, 0x16, 0x00, 0x00,
 }

cmd/protoc-gen-go/testdata/proto2/fields.proto

@@ -124,6 +124,7 @@ message FieldTestMessage {
     group OneofGroup = 618 {
       optional string oneof_group_field = 619;
     }
+    int32 oneof_largest_tag = 536870911;
   }
 
   oneof oneof_two {