cmd/protoc-gen-go: improve generation of comments

The following improvements were made:
* All standalone comments above the "syntax" marker are preserved
similar to Java and some other generators.
* All standalone comments above the "package" marker are preserved
to be consistent with our former behavior.
* Leading comments are now generated for enums and extension fields.
* Single-line trailing comments are now generated for
enum values, message fields, and extension fields.
* The leading comments for each field that is part of a oneof are now
generated with the wrapper types rather than being shoved into the
comment for the oneof itself in an unreadable way.
* The deprecation marker is always generated as being above the declaration
rather than sometimes being an inlined comment.
* The deprecation marker is now properly generated for weak field setters.

Updates golang/protobuf#666

Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238
Reviewed-by: Damien Neil <dneil@google.com>

cmd/protoc-gen-go-grpc/testdata/grpc/deprecation.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: grpc/deprecation.proto
 

cmd/protoc-gen-go-grpc/testdata/grpc/grpc.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: grpc/grpc.proto
 

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

@@ -144,6 +144,8 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 		}
 	}
 
+	genStandaloneComments(g, f, fieldnum.FileDescriptorProto_Syntax)
+
 	g.P("// Code generated by protoc-gen-go. DO NOT EDIT.")
 	if f.Proto.GetOptions().GetDeprecated() {
 		g.P("// ", f.Desc.Path(), " is a deprecated file.")
@@ -152,14 +154,8 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 	}
 	g.P()
 
-	for _, loc := range f.Proto.GetSourceCodeInfo().GetLocation() {
-		if len(loc.Path) == 1 && loc.Path[0] == fieldnum.FileDescriptorProto_Package {
-			if s := loc.GetLeadingComments(); s != "" {
-				g.P(protogen.Comments(s))
-				g.P()
-			}
-		}
-	}
+	genStandaloneComments(g, f, fieldnum.FileDescriptorProto_Package)
+
 	g.P("package ", f.GoPackageName)
 	g.P()
 
@@ -196,6 +192,23 @@ func walkMessages(messages []*protogen.Message, f func(*protogen.Message)) {
 	}
 }
 
+// genStandaloneComments prints all leading comments for a FileDescriptorProto
+// location identified by the field number n.
+func genStandaloneComments(g *protogen.GeneratedFile, f *fileInfo, n int32) {
+	for _, loc := range f.Proto.GetSourceCodeInfo().GetLocation() {
+		if len(loc.Path) == 1 && loc.Path[0] == n {
+			for _, s := range loc.GetLeadingDetachedComments() {
+				g.P(protogen.Comments(s))
+				g.P()
+			}
+			if s := loc.GetLeadingComments(); s != "" {
+				g.P(protogen.Comments(s))
+				g.P()
+			}
+		}
+	}
+}
+
 func genImport(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, imp protoreflect.FileImport) {
 	impFile, ok := gen.FileByName(imp.Path())
 	if !ok {
@@ -249,7 +262,7 @@ func genImport(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, imp
 		}
 		g.P(tok, " ", name, " = ", impFile.GoImportPath.Ident(name))
 	}
-	g.P("// Symbols defined in public import of ", imp.Path())
+	g.P("// Symbols defined in public import of ", imp.Path(), ".")
 	g.P()
 	for _, decl := range astFile.Decls {
 		switch decl := decl.(type) {
@@ -279,17 +292,20 @@ func genImport(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, imp
 func genEnum(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, enum *protogen.Enum) {
 	// Enum type declaration.
 	g.Annotate(enum.GoIdent.GoName, enum.Location)
-	g.P(enum.Comments.Leading,
-		"type ", enum.GoIdent, " int32",
-		deprecationComment(enum.Desc.Options().(*descriptorpb.EnumOptions).GetDeprecated()))
+	leadingComments := appendDeprecationSuffix(enum.Comments.Leading,
+		enum.Desc.Options().(*descriptorpb.EnumOptions).GetDeprecated())
+	g.P(leadingComments,
+		"type ", enum.GoIdent, " int32")
 
 	// Enum value constants.
 	g.P("const (")
 	for _, value := range enum.Values {
 		g.Annotate(value.GoIdent.GoName, value.Location)
-		g.P(value.Comments.Leading,
+		leadingComments := appendDeprecationSuffix(value.Comments.Leading,
+			value.Desc.Options().(*descriptorpb.EnumValueOptions).GetDeprecated())
+		g.P(leadingComments,
 			value.GoIdent, " ", enum.GoIdent, " = ", value.Desc.Number(),
-			deprecationComment(value.Desc.Options().(*descriptorpb.EnumValueOptions).GetDeprecated()))
+			trailingComment(value.Comments.Trailing))
 	}
 	g.P(")")
 	g.P()
@@ -381,15 +397,9 @@ func genMessage(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, me
 	}
 
 	// Message type declaration.
-	leadingComments := message.Comments.Leading
-	if message.Desc.Options().(*descriptorpb.MessageOptions).GetDeprecated() {
-		if leadingComments != "" {
-			g.P(leadingComments, "//")
-			leadingComments = "" // avoid printing them again later
-		}
-		g.P(deprecationComment(true))
-	}
 	g.Annotate(message.GoIdent.GoName, message.Location)
+	leadingComments := appendDeprecationSuffix(message.Comments.Leading,
+		message.Desc.Options().(*descriptorpb.MessageOptions).GetDeprecated())
 	g.P(leadingComments,
 		"type ", message.GoIdent, " struct {")
 	genMessageFields(g, f, message)
@@ -441,6 +451,9 @@ func genMessageInternalFields(g *protogen.GeneratedFile, message *protogen.Messa
 			sf.append("extensionFields")
 		}
 	}
+	if sf.count > 0 {
+		g.P()
+	}
 }
 
 func genMessageField(g *protogen.GeneratedFile, f *fileInfo, message *protogen.Message, field *protogen.Field, sf *structFields) {
@@ -452,16 +465,19 @@ func genMessageField(g *protogen.GeneratedFile, f *fileInfo, message *protogen.M
 		if oneof.Fields[0] != field {
 			return // only generate for first appearance
 		}
-		if oneof.Comments.Leading != "" {
-			g.P(oneof.Comments.Leading, "//")
+
+		g.Annotate(message.GoIdent.GoName+"."+oneof.GoName, oneof.Location)
+		leadingComments := oneof.Comments.Leading
+		if leadingComments != "" {
+			leadingComments += "\n"
 		}
-		g.P("// Types that are valid to be assigned to ", oneof.GoName, ":")
+		ss := []string{fmt.Sprintf(" Types that are assignable to %s:\n", oneof.GoName)}
 		for _, field := range oneof.Fields {
-			g.P(field.Comments.Leading,
-				"//\t*", fieldOneofType(field))
+			ss = append(ss, "\t*"+fieldOneofType(field).GoName+"\n")
 		}
-		g.Annotate(message.GoIdent.GoName+"."+oneof.GoName, oneof.Location)
-		g.P(oneof.GoName, " ", oneofInterfaceName(oneof), " `protobuf_oneof:\"", oneof.Desc.Name(), "\"`")
+		leadingComments += protogen.Comments(strings.Join(ss, ""))
+		g.P(leadingComments,
+			oneof.GoName, " ", oneofInterfaceName(oneof), " `protobuf_oneof:\"", oneof.Desc.Name(), "\"`")
 		sf.append(oneof.GoName)
 		return
 	}
@@ -487,9 +503,11 @@ func genMessageField(g *protogen.GeneratedFile, f *fileInfo, message *protogen.M
 		name = "XXX_weak_" + name
 	}
 	g.Annotate(message.GoIdent.GoName+"."+name, field.Location)
-	g.P(field.Comments.Leading,
+	leadingComments := appendDeprecationSuffix(field.Comments.Leading,
+		field.Desc.Options().(*descriptorpb.FieldOptions).GetDeprecated())
+	g.P(leadingComments,
 		name, " ", goType, " `", strings.Join(tags, " "), "`",
-		deprecationComment(field.Desc.Options().(*descriptorpb.FieldOptions).GetDeprecated()))
+		trailingComment(field.Comments.Trailing))
 	sf.append(field.GoName)
 }
 
@@ -628,13 +646,12 @@ func genMessageGetterMethods(gen *protogen.Plugin, g *protogen.GeneratedFile, f
 		// Getter for message field.
 		goType, pointer := fieldGoType(g, f, field)
 		defaultValue := fieldDefaultValue(g, message, field)
-		if field.Desc.Options().(*descriptorpb.FieldOptions).GetDeprecated() {
-			g.P(deprecationComment(true))
-		}
 		g.Annotate(message.GoIdent.GoName+".Get"+field.GoName, field.Location)
+		leadingComments := appendDeprecationSuffix("",
+			field.Desc.Options().(*descriptorpb.FieldOptions).GetDeprecated())
 		switch {
 		case field.Desc.IsWeak():
-			g.P("func (x *", message.GoIdent, ") Get", field.GoName, "() ", protoifacePackage.Ident("MessageV1"), "{")
+			g.P(leadingComments, "func (x *", message.GoIdent, ") Get", field.GoName, "() ", protoifacePackage.Ident("MessageV1"), "{")
 			g.P("if x != nil {")
 			g.P("v := x.XXX_weak[", field.Desc.Number(), "]")
 			g.P("_ = x.XXX_weak_" + field.GoName) // for field tracking
@@ -645,14 +662,14 @@ func genMessageGetterMethods(gen *protogen.Plugin, g *protogen.GeneratedFile, f
 			g.P("return ", protoimplPackage.Ident("X"), ".WeakNil(", strconv.Quote(string(field.Message.Desc.FullName())), ")")
 			g.P("}")
 		case field.Oneof != nil:
-			g.P("func (x *", message.GoIdent, ") Get", field.GoName, "() ", goType, " {")
+			g.P(leadingComments, "func (x *", message.GoIdent, ") Get", field.GoName, "() ", goType, " {")
 			g.P("if x, ok := x.Get", field.Oneof.GoName, "().(*", fieldOneofType(field), "); ok {")
 			g.P("return x.", field.GoName)
 			g.P("}")
 			g.P("return ", defaultValue)
 			g.P("}")
 		default:
-			g.P("func (x *", message.GoIdent, ") Get", field.GoName, "() ", goType, " {")
+			g.P(leadingComments, "func (x *", message.GoIdent, ") Get", field.GoName, "() ", goType, " {")
 			if field.Desc.Syntax() == protoreflect.Proto3 || defaultValue == "nil" {
 				g.P("if x != nil {")
 			} else {
@@ -675,7 +692,9 @@ func genMessageSetterMethods(gen *protogen.Plugin, g *protogen.GeneratedFile, f
 	for _, field := range message.Fields {
 		if field.Desc.IsWeak() {
 			g.Annotate(message.GoIdent.GoName+".Set"+field.GoName, field.Location)
-			g.P("func (x *", message.GoIdent, ") Set", field.GoName, "(v ", protoifacePackage.Ident("MessageV1"), ") {")
+			leadingComments := appendDeprecationSuffix("",
+				field.Desc.Options().(*descriptorpb.FieldOptions).GetDeprecated())
+			g.P(leadingComments, "func (x *", message.GoIdent, ") Set", field.GoName, "(v ", protoifacePackage.Ident("MessageV1"), ") {")
 			g.P("if x.XXX_weak == nil {")
 			g.P("x.XXX_weak = make(", protoimplPackage.Ident("WeakFields"), ")")
 			g.P("}")
@@ -801,6 +820,7 @@ func genExtensions(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo)
 		g.P("},")
 	}
 	g.P("}")
+	g.P()
 
 	// Group extensions by the target message.
 	var orderedTargets []protogen.GoIdent
@@ -818,17 +838,27 @@ func genExtensions(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo)
 		g.P("// Extension fields to ", target, ".")
 		g.P("var (")
 		for _, extension := range allExtensionsByTarget[target] {
-			ed := extension.Desc
-			typeName := ed.Kind().String()
-			switch ed.Kind() {
+			xd := extension.Desc
+			typeName := xd.Kind().String()
+			switch xd.Kind() {
 			case protoreflect.EnumKind:
-				typeName = string(ed.Enum().FullName())
+				typeName = string(xd.Enum().FullName())
 			case protoreflect.MessageKind, protoreflect.GroupKind:
-				typeName = string(ed.Message().FullName())
+				typeName = string(xd.Message().FullName())
+			}
+			fieldName := string(xd.Name())
+
+			leadingComments := extension.Comments.Leading
+			if leadingComments != "" {
+				leadingComments += "\n"
 			}
-			fieldName := string(ed.Name())
-			g.P("// ", ed.Cardinality().String(), " ", typeName, " ", fieldName, " = ", ed.Number(), ";")
-			g.P(extensionVar(f.File, extension), " = &", extDescsVarName(f), "[", allExtensionsByPtr[extension], "]")
+			leadingComments += protogen.Comments(fmt.Sprintf(" %v %v %v = %v;\n",
+				xd.Cardinality(), typeName, fieldName, xd.Number()))
+			leadingComments = appendDeprecationSuffix(leadingComments,
+				extension.Desc.Options().(*descriptorpb.FieldOptions).GetDeprecated())
+			g.P(leadingComments,
+				extensionVar(f.File, extension), " = &", extDescsVarName(f), "[", allExtensionsByPtr[extension], "]",
+				trailingComment(extension.Comments.Trailing))
 		}
 		g.P(")")
 		g.P()
@@ -845,14 +875,6 @@ func extensionVar(f *protogen.File, extension *protogen.Extension) protogen.GoId
 	return f.GoImportPath.Ident(name)
 }
 
-// deprecationComment returns a standard deprecation comment if deprecated is true.
-func deprecationComment(deprecated bool) string {
-	if !deprecated {
-		return ""
-	}
-	return "// Deprecated: Do not use."
-}
-
 // genOneofWrapperTypes generates the oneof wrapper types and
 // associates the types with the parent message type.
 func genOneofWrapperTypes(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fileInfo, message *protogen.Message) {
@@ -871,7 +893,11 @@ func genOneofWrapperTypes(gen *protogen.Plugin, g *protogen.GeneratedFile, f *fi
 			tags := []string{
 				fmt.Sprintf("protobuf:%q", fieldProtobufTag(field)),
 			}
-			g.P(field.GoName, " ", goType, " `", strings.Join(tags, " "), "`")
+			leadingComments := appendDeprecationSuffix(field.Comments.Leading,
+				field.Desc.Options().(*descriptorpb.FieldOptions).GetDeprecated())
+			g.P(leadingComments,
+				field.GoName, " ", goType, " `", strings.Join(tags, " "), "`",
+				trailingComment(field.Comments.Trailing))
 			g.P("}")
 			g.P()
 		}
@@ -919,3 +945,27 @@ Loop:
 		return ident
 	}
 }
+
+// appendDeprecationSuffix optionally appends a deprecation notice as a suffix.
+func appendDeprecationSuffix(prefix protogen.Comments, deprecated bool) protogen.Comments {
+	if !deprecated {
+		return prefix
+	}
+	if prefix != "" {
+		prefix += "\n"
+	}
+	return prefix + " Deprecated: Do not use.\n"
+}
+
+// trailingComment is like protogen.Comments, but lacks a trailing newline.
+type trailingComment protogen.Comments
+
+func (c trailingComment) String() string {
+	s := strings.TrimSuffix(protogen.Comments(c).String(), "\n")
+	if strings.Contains(s, "\n") {
+		// We don't support multi-lined trailing comments as it is unclear
+		// how to best render them in the generated code.
+		return ""
+	}
+	return s
+}

cmd/protoc-gen-go/testdata/annotations/annotations.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: annotations/annotations.proto
 
@@ -72,9 +76,10 @@ func (AnnotationsTestEnum) EnumDescriptor() ([]byte, []int) {
 }
 
 type AnnotationsTestMessage struct {
-	state                protoimpl.MessageState
-	sizeCache            protoimpl.SizeCache
-	unknownFields        protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	AnnotationsTestField *string `protobuf:"bytes,1,opt,name=AnnotationsTestField" json:"AnnotationsTestField,omitempty"`
 }
 

cmd/protoc-gen-go/testdata/annotations/annotations.pb.go.meta

@@ -1 +1 @@
-annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:590 end:609} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:626 end:673} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:1953 end:1975} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2119 end:2139} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:3033 end:3056}
+annotation:{path:5 path:0 source_file:"annotations/annotations.proto" begin:750 end:769} annotation:{path:5 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:786 end:833} annotation:{path:4 path:0 source_file:"annotations/annotations.proto" begin:2113 end:2135} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:2259 end:2279} annotation:{path:4 path:0 path:2 path:0 source_file:"annotations/annotations.proto" begin:3173 end:3196}

cmd/protoc-gen-go/testdata/comments/comments.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: comments/comments.proto
 
@@ -7,6 +11,8 @@ package comments
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	prototype "google.golang.org/protobuf/reflect/prototype"
+	protoiface "google.golang.org/protobuf/runtime/protoiface"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
@@ -19,17 +25,77 @@ const (
 	_ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
 )
 
-// COMMENT: Message1
+// COMMENT: Enum1.Leading
+type Enum1 int32
+
+const (
+	// COMMENT: FOO.Leading
+	Enum1_FOO Enum1 = 0 // COMMENT: FOO.InlineTrailing
+	// COMMENT: BAR.Leading
+	Enum1_BAR Enum1 = 1
+)
+
+// Enum value maps for Enum1.
+var (
+	Enum1_name = map[int32]string{
+		0: "FOO",
+		1: "BAR",
+	}
+	Enum1_value = map[string]int32{
+		"FOO": 0,
+		"BAR": 1,
+	}
+)
+
+func (x Enum1) Enum() *Enum1 {
+	p := new(Enum1)
+	*p = x
+	return p
+}
+
+func (x Enum1) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (Enum1) Descriptor() protoreflect.EnumDescriptor {
+	return file_comments_comments_proto_enumTypes[0].EnumDescriptor
+}
+
+func (Enum1) Type() protoreflect.EnumType {
+	return &file_comments_comments_proto_enumTypes[0]
+}
+
+func (x Enum1) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *Enum1) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
+	if err != nil {
+		return err
+	}
+	*x = Enum1(num)
+	return nil
+}
+
+// Deprecated: Use Enum1.Descriptor instead.
+func (Enum1) EnumDescriptor() ([]byte, []int) {
+	return file_comments_comments_proto_rawDescGZIP(), []int{0}
+}
+
+// COMMENT: Message1.Leading
 type Message1 struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-	// COMMENT: Field1A
-	Field1A *string `protobuf:"bytes,1,opt,name=Field1A" json:"Field1A,omitempty"`
-	// COMMENT: Oneof1A
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
+
+	// COMMENT: Field1A.Leading
+	Field1A *string `protobuf:"bytes,1,opt,name=Field1A" json:"Field1A,omitempty"` // COMMENT: Field1A.Trailing
+	// COMMENT: Oneof1A.Leading
 	//
-	// Types that are valid to be assigned to Oneof1A:
-	// COMMENT: Oneof1AField1
+	// Types that are assignable to Oneof1A:
 	//	*Message1_Oneof1AField1
 	Oneof1A isMessage1_Oneof1A `protobuf_oneof:"Oneof1a"`
 }
@@ -61,6 +127,15 @@ func (*Message1) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{0}
 }
 
+var extRange_Message1 = []protoiface.ExtensionRangeV1{
+	{Start: 100, End: 536870911},
+}
+
+// Deprecated: Use Message1.ProtoReflect.Descriptor.ExtensionRanges instead.
+func (*Message1) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
+	return extRange_Message1
+}
+
 func (x *Message1) GetField1A() string {
 	if x != nil && x.Field1A != nil {
 		return *x.Field1A
@@ -87,7 +162,8 @@ type isMessage1_Oneof1A interface {
 }
 
 type Message1_Oneof1AField1 struct {
-	Oneof1AField1 string `protobuf:"bytes,2,opt,name=Oneof1AField1,oneof"`
+	// COMMENT: Oneof1AField1.Leading
+	Oneof1AField1 string `protobuf:"bytes,2,opt,name=Oneof1AField1,oneof"` // COMMENT: Oneof1AField1.Trailing
 }
 
 func (*Message1_Oneof1AField1) isMessage1_Oneof1A() {}
@@ -126,7 +202,7 @@ func (*Message2) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{1}
 }
 
-// COMMENT: Message1A
+// COMMENT: Message1A.Leading
 type Message1_Message1A struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -262,26 +338,54 @@ func (*Message2_Message2B) Descriptor() ([]byte, []int) {
 	return file_comments_comments_proto_rawDescGZIP(), []int{1, 1}
 }
 
+var file_comments_comments_proto_extDescs = []protoiface.ExtensionDescV1{
+	{
+		ExtendedType:  (*Message1)(nil),
+		ExtensionType: (*Message1)(nil),
+		Field:         100,
+		Name:          "goproto.protoc.comments.extension",
+		Tag:           "bytes,100,opt,name=extension",
+		Filename:      "comments/comments.proto",
+	},
+}
+
+// Extension fields to Message1.
+var (
+	// COMMENT: Extension.Leading
+	//
+	// optional goproto.protoc.comments.Message1 extension = 100;
+	E_Extension = &file_comments_comments_proto_extDescs[0] // COMMENT: Extension.Trailing
+)
+
 var File_comments_comments_proto protoreflect.FileDescriptor
 
 var file_comments_comments_proto_rawDesc = []byte{
 	0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65,
 	0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x17, 0x67, 0x6f, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
-	0x74, 0x73, 0x22, 0x71, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x12, 0x18,
+	0x74, 0x73, 0x22, 0x7b, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x12, 0x18,
 	0x0a, 0x07, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x07, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x41, 0x12, 0x26, 0x0a, 0x0d, 0x4f, 0x6e, 0x65, 0x6f,
 	0x66, 0x31, 0x41, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48,
 	0x00, 0x52, 0x0d, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x31, 0x41, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31,
 	0x1a, 0x0b, 0x0a, 0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x41, 0x1a, 0x0b, 0x0a,
-	0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x42, 0x42, 0x09, 0x0a, 0x07, 0x4f, 0x6e,
-	0x65, 0x6f, 0x66, 0x31, 0x61, 0x22, 0x24, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x32, 0x1a, 0x0b, 0x0a, 0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x41, 0x1a, 0x0b,
-	0x0a, 0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x42, 0x42, 0x40, 0x5a, 0x3e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74,
-	0x64, 0x61, 0x74, 0x61, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+	0x09, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x42, 0x2a, 0x08, 0x08, 0x64, 0x10, 0x80,
+	0x80, 0x80, 0x80, 0x02, 0x42, 0x09, 0x0a, 0x07, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x31, 0x61, 0x22,
+	0x24, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x1a, 0x0b, 0x0a, 0x09, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x41, 0x1a, 0x0b, 0x0a, 0x09, 0x4d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x32, 0x42, 0x2a, 0x19, 0x0a, 0x05, 0x45, 0x6e, 0x75, 0x6d, 0x31, 0x12, 0x07,
+	0x0a, 0x03, 0x46, 0x4f, 0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x41, 0x52, 0x10, 0x01,
+	0x3a, 0x62, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x2e,
+	0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31,
+	0x18, 0x64, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73,
+	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x52, 0x09, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x42, 0x40, 0x5a, 0x3e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67,
+	0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65,
+	0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x63, 0x6f,
+	0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73,
 }
 
 var (
@@ -296,19 +400,23 @@ func file_comments_comments_proto_rawDescGZIP() []byte {
 	return file_comments_comments_proto_rawDescData
 }
 
+var file_comments_comments_proto_enumTypes = make([]prototype.Enum, 1)
 var file_comments_comments_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_comments_comments_proto_goTypes = []interface{}{
-	(*Message1)(nil),           // 0: goproto.protoc.comments.Message1
-	(*Message2)(nil),           // 1: goproto.protoc.comments.Message2
-	(*Message1_Message1A)(nil), // 2: goproto.protoc.comments.Message1.Message1A
-	(*Message1_Message1B)(nil), // 3: goproto.protoc.comments.Message1.Message1B
-	(*Message2_Message2A)(nil), // 4: goproto.protoc.comments.Message2.Message2A
-	(*Message2_Message2B)(nil), // 5: goproto.protoc.comments.Message2.Message2B
+	(Enum1)(0),                 // 0: goproto.protoc.comments.Enum1
+	(*Message1)(nil),           // 1: goproto.protoc.comments.Message1
+	(*Message2)(nil),           // 2: goproto.protoc.comments.Message2
+	(*Message1_Message1A)(nil), // 3: goproto.protoc.comments.Message1.Message1A
+	(*Message1_Message1B)(nil), // 4: goproto.protoc.comments.Message1.Message1B
+	(*Message2_Message2A)(nil), // 5: goproto.protoc.comments.Message2.Message2A
+	(*Message2_Message2B)(nil), // 6: goproto.protoc.comments.Message2.Message2B
 }
 var file_comments_comments_proto_depIdxs = []int32{
-	0, // starting offset of method output_type sub-list
-	0, // starting offset of method input_type sub-list
-	0, // starting offset of extension type_name sub-list
+	1, // goproto.protoc.comments.extension:extendee -> goproto.protoc.comments.Message1
+	1, // goproto.protoc.comments.extension:type_name -> goproto.protoc.comments.Message1
+	2, // starting offset of method output_type sub-list
+	2, // starting offset of method input_type sub-list
+	1, // starting offset of extension type_name sub-list
 	0, // starting offset of extension extendee sub-list
 	0, // starting offset of field type_name sub-list
 }
@@ -327,6 +435,8 @@ func file_comments_comments_proto_init() {
 				return &v.sizeCache
 			case 2:
 				return &v.unknownFields
+			case 3:
+				return &v.extensionFields
 			default:
 				return nil
 			}
@@ -400,16 +510,18 @@ func file_comments_comments_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_comments_comments_proto_rawDesc,
-			NumEnums:      0,
+			NumEnums:      1,
 			NumMessages:   6,
-			NumExtensions: 0,
+			NumExtensions: 1,
 			NumServices:   0,
 		},
 		GoTypes:           file_comments_comments_proto_goTypes,
 		DependencyIndexes: file_comments_comments_proto_depIdxs,
 		MessageInfos:      file_comments_comments_proto_msgTypes,
+		LegacyExtensions:  file_comments_comments_proto_extDescs,
 	}.Build()
 	File_comments_comments_proto = out.File
+	file_comments_comments_proto_enumTypes = out.Enums
 	file_comments_comments_proto_rawDesc = nil
 	file_comments_comments_proto_goTypes = nil
 	file_comments_comments_proto_depIdxs = nil

cmd/protoc-gen-go/testdata/comments/comments.proto

@@ -9,24 +9,44 @@ package goproto.protoc.comments;
 
 option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/comments";
 
-// COMMENT: Message1
+// COMMENT: Enum1.Leading
+enum Enum1 {
+  // COMMENT: FOO.Leading
+  FOO = 0; // COMMENT: FOO.InlineTrailing
+  // COMMENT: BAR.Leading
+  BAR = 1;
+  // COMMENT: BAR.Trailing1
+  // COMMENT: BAR.Trailing2
+
+  // COMMENT: Enum1.EndBody
+}
+
+// COMMENT: Message1.Leading
 message Message1 {
-  // COMMENT: Message1A
+  // COMMENT: Message1A.Leading
   message Message1A {
-  }
+  } // COMMENT: Message1A.Trailing
 
   // COMMENT: Message1B
   message Message1B {
   }
 
-  // COMMENT: Field1A
-  optional string Field1A = 1;
+  // COMMENT: Field1A.Leading
+  optional string Field1A = 1; // COMMENT: Field1A.Trailing
 
-  // COMMENT: Oneof1A
+  // COMMENT: Oneof1A.Leading
   oneof Oneof1a {
-    // COMMENT: Oneof1AField1
-    string Oneof1AField1 = 2;
-  }
+    // COMMENT: Oneof1AField1.Leading
+    string Oneof1AField1 = 2; // COMMENT: Oneof1AField1.Trailing
+  } // COMMENT: Oneof1A.Trailing
+
+  extensions 100 to max;
+} // COMMENT: Message1.Trailing
+
+// COMMENT: Extend
+extend Message1 {
+  // COMMENT: Extension.Leading
+  optional Message1 extension = 100; // COMMENT: Extension.Trailing
 }
 
 // COMMENT: Message2

cmd/protoc-gen-go/testdata/comments/deprecated.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // comments/deprecated.proto is a deprecated file.
 
@@ -18,9 +22,12 @@ const (
 	_ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
 )
 
-type DeprecatedEnum int32 // Deprecated: Do not use.
+// Deprecated: Do not use.
+type DeprecatedEnum int32
+
 const (
-	DeprecatedEnum_DEPRECATED DeprecatedEnum = 0 // Deprecated: Do not use.
+	// Deprecated: Do not use.
+	DeprecatedEnum_DEPRECATED DeprecatedEnum = 0
 )
 
 // Enum value maps for DeprecatedEnum.
@@ -62,10 +69,12 @@ func (DeprecatedEnum) EnumDescriptor() ([]byte, []int) {
 
 // Deprecated: Do not use.
 type DeprecatedMessage struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	DeprecatedField string `protobuf:"bytes,1,opt,name=deprecated_field,json=deprecatedField,proto3" json:"deprecated_field,omitempty"` // Deprecated: Do not use.
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Deprecated: Do not use.
+	DeprecatedField string `protobuf:"bytes,1,opt,name=deprecated_field,json=deprecatedField,proto3" json:"deprecated_field,omitempty"`
 }
 
 func (x *DeprecatedMessage) Reset() {

cmd/protoc-gen-go/testdata/extensions/base/base.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: extensions/base/base.proto
 
@@ -23,7 +27,8 @@ type BaseMessage struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field           *string `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
+
+	Field *string `protobuf:"bytes,1,opt,name=field" json:"field,omitempty"`
 }
 
 func (x *BaseMessage) Reset() {

cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: extensions/ext/ext.proto
 
@@ -78,7 +82,8 @@ type Message struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Data          []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+
+	Data []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
 }
 
 func (x *Message) Reset() {
@@ -116,9 +121,10 @@ func (x *Message) GetData() []byte {
 }
 
 type ExtensionGroup struct {
-	state          protoimpl.MessageState
-	sizeCache      protoimpl.SizeCache
-	unknownFields  protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	ExtensionGroup *string `protobuf:"bytes,120,opt,name=extension_group,json=extensionGroup" json:"extension_group,omitempty"`
 }
 
@@ -191,9 +197,10 @@ func (*ExtendingMessage) Descriptor() ([]byte, []int) {
 }
 
 type RepeatedGroup struct {
-	state          protoimpl.MessageState
-	sizeCache      protoimpl.SizeCache
-	unknownFields  protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	RepeatedXGroup []string `protobuf:"bytes,319,rep,name=repeated_x_group,json=repeatedXGroup" json:"repeated_x_group,omitempty"`
 }
 

cmd/protoc-gen-go/testdata/extensions/extra/extra.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: extensions/extra/extra.proto
 
@@ -21,7 +25,8 @@ type ExtraMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Data          []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
+
+	Data []byte `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
 }
 
 func (x *ExtraMessage) Reset() {

cmd/protoc-gen-go/testdata/extensions/proto3/ext3.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: extensions/proto3/ext3.proto
 

cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: fieldnames/fieldnames.proto
 
@@ -26,6 +30,7 @@ type Message struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Various CamelCase conversions.
 	FieldOne   *string `protobuf:"bytes,1,opt,name=field_one,json=fieldOne" json:"field_one,omitempty"`
 	FieldTwo   *string `protobuf:"bytes,2,opt,name=FieldTwo" json:"FieldTwo,omitempty"`
@@ -39,25 +44,25 @@ type Message struct {
 	// Field names that conflict with each other after CamelCasing.
 	CamelCase    *string `protobuf:"bytes,20,opt,name=CamelCase" json:"CamelCase,omitempty"`
 	CamelCase_   *string `protobuf:"bytes,21,opt,name=CamelCase_,json=CamelCase" json:"CamelCase_,omitempty"`
-	CamelCase__  *string `protobuf:"bytes,22,opt,name=camel_case,json=camelCase" json:"camel_case,omitempty"`
-	CamelCase___ *string `protobuf:"bytes,23,opt,name=CamelCase__,json=CamelCase" json:"CamelCase__,omitempty"`
+	CamelCase__  *string `protobuf:"bytes,22,opt,name=camel_case,json=camelCase" json:"camel_case,omitempty"`   // conflicts with 20, 21
+	CamelCase___ *string `protobuf:"bytes,23,opt,name=CamelCase__,json=CamelCase" json:"CamelCase__,omitempty"` // conflicts with 21, 21, renamed 22
 	// Field with a getter that conflicts with another field.
 	GetName *string `protobuf:"bytes,30,opt,name=get_name,json=getName" json:"get_name,omitempty"`
 	Name_   *string `protobuf:"bytes,31,opt,name=name" json:"name,omitempty"`
 	// Oneof that conflicts with its first field: The oneof is renamed.
 	//
-	// Types that are valid to be assigned to OneofConflictA_:
+	// Types that are assignable to OneofConflictA_:
 	//	*Message_OneofConflictA
 	OneofConflictA_ isMessage_OneofConflictA_ `protobuf_oneof:"oneof_conflict_a"`
 	// Oneof that conflicts with its second field: The field is renamed.
 	//
-	// Types that are valid to be assigned to OneofConflictB:
+	// Types that are assignable to OneofConflictB:
 	//	*Message_OneofNoConflict
 	//	*Message_OneofConflictB_
 	OneofConflictB isMessage_OneofConflictB `protobuf_oneof:"oneof_conflict_b"`
 	// Oneof with a field name that conflicts with a nested message.
 	//
-	// Types that are valid to be assigned to OneofConflictC:
+	// Types that are assignable to OneofConflictC:
 	//	*Message_OneofMessageConflict_
 	OneofConflictC isMessage_OneofConflictC `protobuf_oneof:"oneof_conflict_c"`
 }

cmd/protoc-gen-go/testdata/import_public/a.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: import_public/a.proto
 
@@ -18,7 +22,7 @@ const (
 	_ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
 )
 
-// Symbols defined in public import of import_public/sub/a.proto
+// Symbols defined in public import of import_public/sub/a.proto.
 
 type E = sub.E
 
@@ -60,9 +64,10 @@ type Public struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	M             *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
-	E             *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"`
-	Local         *Local `protobuf:"bytes,3,opt,name=local" json:"local,omitempty"`
+
+	M     *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
+	E     *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"`
+	Local *Local `protobuf:"bytes,3,opt,name=local" json:"local,omitempty"`
 }
 
 func (x *Public) Reset() {

cmd/protoc-gen-go/testdata/import_public/b.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: import_public/b.proto
 
@@ -22,8 +26,9 @@ type Local struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	M             *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
-	E             *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"`
+
+	M *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"`
+	E *sub.E `protobuf:"varint,2,opt,name=e,enum=goproto.protoc.import_public.sub.E" json:"e,omitempty"`
 }
 
 func (x *Local) Reset() {

cmd/protoc-gen-go/testdata/import_public/c.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: import_public/c.proto
 
@@ -22,11 +26,12 @@ type UsingPublicImport struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Local is declared in b.proto, which is a public import of a.proto.
 	Local *Local `protobuf:"bytes,1,opt,name=local" json:"local,omitempty"`
 	// Sub2Message is declared in sub2/a.proto, which is a public import of
 	// sub/a.proto, which is a public import of a.proto.
-	Sub2 *sub2.Sub2Message `protobuf:"bytes,2,opt,name=sub2" json:"sub2,omitempty"`
+	Sub2 *sub2.Sub2Message `protobuf:"bytes,2,opt,name=sub2" json:"sub2,omitempty"` // declared in sub2/a.proto
 }
 
 func (x *UsingPublicImport) Reset() {

cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: import_public/sub/a.proto
 
@@ -21,7 +25,7 @@ const (
 	_ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
 )
 
-// Symbols defined in public import of import_public/sub2/a.proto
+// Symbols defined in public import of import_public/sub2/a.proto.
 
 type Sub2Message = sub2.Sub2Message
 
@@ -189,12 +193,13 @@ type M struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// Field using a type in the same Go package, but a different source file.
 	M2 *M2      `protobuf:"bytes,1,opt,name=m2" json:"m2,omitempty"`
 	S  *string  `protobuf:"bytes,4,opt,name=s,def=default" json:"s,omitempty"`
 	B  []byte   `protobuf:"bytes,5,opt,name=b,def=default" json:"b,omitempty"`
 	F  *float64 `protobuf:"fixed64,6,opt,name=f,def=nan" json:"f,omitempty"`
-	// Types that are valid to be assigned to OneofField:
+	// Types that are assignable to OneofField:
 	//	*M_OneofInt32
 	//	*M_OneofInt64
 	OneofField isM_OneofField `protobuf_oneof:"oneof_field"`
@@ -316,7 +321,8 @@ type M_Submessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	// Types that are valid to be assigned to SubmessageOneofField:
+
+	// Types that are assignable to SubmessageOneofField:
 	//	*M_Submessage_SubmessageOneofInt32
 	//	*M_Submessage_SubmessageOneofInt64
 	SubmessageOneofField isM_Submessage_SubmessageOneofField `protobuf_oneof:"submessage_oneof_field"`

cmd/protoc-gen-go/testdata/import_public/sub/b.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: import_public/sub/b.proto
 

cmd/protoc-gen-go/testdata/import_public/sub2/a.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: import_public/sub2/a.proto
 

cmd/protoc-gen-go/testdata/imports/fmt/m.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/fmt/m.proto
 

cmd/protoc-gen-go/testdata/imports/test_a_1/m1.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_a_1/m1.proto
 
@@ -98,7 +102,8 @@ type M1_1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	M1            *M1 `protobuf:"bytes,1,opt,name=m1,proto3" json:"m1,omitempty"`
+
+	M1 *M1 `protobuf:"bytes,1,opt,name=m1,proto3" json:"m1,omitempty"`
 }
 
 func (x *M1_1) Reset() {

cmd/protoc-gen-go/testdata/imports/test_a_1/m2.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_a_1/m2.proto
 

cmd/protoc-gen-go/testdata/imports/test_a_2/m3.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_a_2/m3.proto
 

cmd/protoc-gen-go/testdata/imports/test_a_2/m4.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_a_2/m4.proto
 

cmd/protoc-gen-go/testdata/imports/test_b_1/m1.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_b_1/m1.proto
 

cmd/protoc-gen-go/testdata/imports/test_b_1/m2.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_b_1/m2.proto
 

cmd/protoc-gen-go/testdata/imports/test_import_a1m1.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_import_a1m1.proto
 
@@ -22,7 +26,8 @@ type A1M1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	F             *test_a_1.M1 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
+
+	F *test_a_1.M1 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
 }
 
 func (x *A1M1) Reset() {

cmd/protoc-gen-go/testdata/imports/test_import_a1m2.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_import_a1m2.proto
 
@@ -22,7 +26,8 @@ type A1M2 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	F             *test_a_1.M2 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
+
+	F *test_a_1.M2 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"`
 }
 
 func (x *A1M2) Reset() {

cmd/protoc-gen-go/testdata/imports/test_import_all.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: imports/test_import_all.proto
 
@@ -25,11 +29,12 @@ type All struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Am1           *test_a_1.M1 `protobuf:"bytes,1,opt,name=am1,proto3" json:"am1,omitempty"`
-	Am2           *test_a_1.M2 `protobuf:"bytes,2,opt,name=am2,proto3" json:"am2,omitempty"`
-	Bm1           *test_b_1.M1 `protobuf:"bytes,5,opt,name=bm1,proto3" json:"bm1,omitempty"`
-	Bm2           *test_b_1.M2 `protobuf:"bytes,6,opt,name=bm2,proto3" json:"bm2,omitempty"`
-	Fmt           *fmt.M       `protobuf:"bytes,7,opt,name=fmt,proto3" json:"fmt,omitempty"`
+
+	Am1 *test_a_1.M1 `protobuf:"bytes,1,opt,name=am1,proto3" json:"am1,omitempty"`
+	Am2 *test_a_1.M2 `protobuf:"bytes,2,opt,name=am2,proto3" json:"am2,omitempty"`
+	Bm1 *test_b_1.M1 `protobuf:"bytes,5,opt,name=bm1,proto3" json:"bm1,omitempty"`
+	Bm2 *test_b_1.M2 `protobuf:"bytes,6,opt,name=bm2,proto3" json:"bm2,omitempty"`
+	Fmt *fmt.M       `protobuf:"bytes,7,opt,name=fmt,proto3" json:"fmt,omitempty"`
 }
 
 func (x *All) Reset() {

cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go

@@ -21,7 +21,8 @@ type Foo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	// Types that are valid to be assigned to Bar:
+
+	// Types that are assignable to Bar:
 	//	*Foo_GetBar
 	Bar isFoo_Bar `protobuf_oneof:"bar"`
 }

cmd/protoc-gen-go/testdata/nopackage/nopackage.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: nopackage/nopackage.proto
 
@@ -75,8 +79,9 @@ type Message struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	StringField   *string `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"`
-	EnumField     *Enum   `protobuf:"varint,2,opt,name=enum_field,json=enumField,enum=Enum,def=0" json:"enum_field,omitempty"`
+
+	StringField *string `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"`
+	EnumField   *Enum   `protobuf:"varint,2,opt,name=enum_field,json=enumField,enum=Enum,def=0" json:"enum_field,omitempty"`
 }
 
 // Default values for Message fields.

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

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: proto2/enum.proto
 
@@ -350,9 +354,10 @@ func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) EnumDescript
 }
 
 type EnumContainerMessage1 struct {
-	state             protoimpl.MessageState
-	sizeCache         protoimpl.SizeCache
-	unknownFields     protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	DefaultDuplicate1 *EnumType2 `protobuf:"varint,1,opt,name=default_duplicate1,json=defaultDuplicate1,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate1,omitempty"`
 	DefaultDuplicate2 *EnumType2 `protobuf:"varint,2,opt,name=default_duplicate2,json=defaultDuplicate2,enum=goproto.protoc.proto2.EnumType2,def=1" json:"default_duplicate2,omitempty"`
 }

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

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: proto2/fields.proto
 
@@ -76,9 +80,10 @@ func (FieldTestMessage_Enum) EnumDescriptor() ([]byte, []int) {
 }
 
 type FieldTestMessage struct {
-	state               protoimpl.MessageState
-	sizeCache           protoimpl.SizeCache
-	unknownFields       protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	OptionalBool        *bool                                `protobuf:"varint,1,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
 	OptionalEnum        *FieldTestMessage_Enum               `protobuf:"varint,2,opt,name=optional_enum,json=optionalEnum,enum=goproto.protoc.proto2.FieldTestMessage_Enum" json:"optional_enum,omitempty"`
 	OptionalInt32       *int32                               `protobuf:"varint,3,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
@@ -160,7 +165,7 @@ type FieldTestMessage struct {
 	MapInt32Int64       map[int32]int64                      `protobuf:"bytes,500,rep,name=map_int32_int64,json=mapInt32Int64" json:"map_int32_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
 	MapStringMessage    map[string]*FieldTestMessage_Message `protobuf:"bytes,501,rep,name=map_string_message,json=mapStringMessage" json:"map_string_message,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	MapFixed64Enum      map[uint64]FieldTestMessage_Enum     `protobuf:"bytes,502,rep,name=map_fixed64_enum,json=mapFixed64Enum" json:"map_fixed64_enum,omitempty" protobuf_key:"fixed64,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=goproto.protoc.proto2.FieldTestMessage_Enum"`
-	// Types that are valid to be assigned to OneofField:
+	// Types that are assignable to OneofField:
 	//	*FieldTestMessage_OneofBool
 	//	*FieldTestMessage_OneofEnum
 	//	*FieldTestMessage_OneofInt32
@@ -181,7 +186,7 @@ type FieldTestMessage struct {
 	//	*FieldTestMessage_Oneofgroup
 	//	*FieldTestMessage_OneofLargestTag
 	OneofField isFieldTestMessage_OneofField `protobuf_oneof:"oneof_field"`
-	// Types that are valid to be assigned to OneofTwo:
+	// Types that are assignable to OneofTwo:
 	//	*FieldTestMessage_OneofTwo_1
 	//	*FieldTestMessage_OneofTwo_2
 	OneofTwo isFieldTestMessage_OneofTwo `protobuf_oneof:"oneof_two"`
@@ -1112,6 +1117,7 @@ type FieldTestMessage_OptionalGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	OptionalGroup *string `protobuf:"bytes,19,opt,name=optional_group,json=optionalGroup" json:"optional_group,omitempty"`
 }
 
@@ -1153,6 +1159,7 @@ type FieldTestMessage_RequiredGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	RequiredGroup *string `protobuf:"bytes,119,req,name=required_group,json=requiredGroup" json:"required_group,omitempty"`
 }
 
@@ -1194,6 +1201,7 @@ type FieldTestMessage_RepeatedGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	RepeatedGroup []string `protobuf:"bytes,219,rep,name=repeated_group,json=repeatedGroup" json:"repeated_group,omitempty"`
 }
 
@@ -1232,9 +1240,10 @@ func (x *FieldTestMessage_RepeatedGroup) GetRepeatedGroup() []string {
 }
 
 type FieldTestMessage_OneofGroup struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	OneofGroupField *string `protobuf:"bytes,619,opt,name=oneof_group_field,json=oneofGroupField" json:"oneof_group_field,omitempty"`
 }
 

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

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: proto2/nested_messages.proto
 
@@ -21,8 +25,9 @@ type Layer1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	L2            *Layer1_Layer2        `protobuf:"bytes,1,opt,name=l2" json:"l2,omitempty"`
-	L3            *Layer1_Layer2_Layer3 `protobuf:"bytes,2,opt,name=l3" json:"l3,omitempty"`
+
+	L2 *Layer1_Layer2        `protobuf:"bytes,1,opt,name=l2" json:"l2,omitempty"`
+	L3 *Layer1_Layer2_Layer3 `protobuf:"bytes,2,opt,name=l3" json:"l3,omitempty"`
 }
 
 func (x *Layer1) Reset() {
@@ -70,7 +75,8 @@ type Layer1_Layer2 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	L3            *Layer1_Layer2_Layer3 `protobuf:"bytes,1,opt,name=l3" json:"l3,omitempty"`
+
+	L3 *Layer1_Layer2_Layer3 `protobuf:"bytes,1,opt,name=l3" json:"l3,omitempty"`
 }
 
 func (x *Layer1_Layer2) Reset() {

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

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: proto2/proto2.proto
 
@@ -21,8 +25,9 @@ type Message struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	I32           *int32   `protobuf:"varint,1,opt,name=i32" json:"i32,omitempty"`
-	M             *Message `protobuf:"bytes,2,opt,name=m" json:"m,omitempty"`
+
+	I32 *int32   `protobuf:"varint,1,opt,name=i32" json:"i32,omitempty"`
+	M   *Message `protobuf:"bytes,2,opt,name=m" json:"m,omitempty"`
 }
 
 func (x *Message) Reset() {

cmd/protoc-gen-go/testdata/proto3/enum.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: proto3/enum.proto
 

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

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: proto3/fields.proto
 
@@ -62,9 +66,10 @@ func (FieldTestMessage_Enum) EnumDescriptor() ([]byte, []int) {
 }
 
 type FieldTestMessage struct {
-	state            protoimpl.MessageState
-	sizeCache        protoimpl.SizeCache
-	unknownFields    protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	OptionalBool     string                               `protobuf:"bytes,1,opt,name=optional_bool,json=optionalBool,proto3" json:"optional_bool,omitempty"`
 	OptionalEnum     FieldTestMessage_Enum                `protobuf:"varint,2,opt,name=optional_enum,json=optionalEnum,proto3,enum=goproto.protoc.proto3.FieldTestMessage_Enum" json:"optional_enum,omitempty"`
 	OptionalInt32    int32                                `protobuf:"varint,3,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`

encoding/testprotos/pb2/test.pb.go

@@ -1,3 +1,9 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Test Protobuf definitions with proto2 syntax.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: pb2/test.proto
 
@@ -149,21 +155,22 @@ type Scalars struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	OptBool       *bool    `protobuf:"varint,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32      *int32   `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
-	OptInt64      *int64   `protobuf:"varint,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
-	OptUint32     *uint32  `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
-	OptUint64     *uint64  `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
-	OptSint32     *int32   `protobuf:"zigzag32,6,opt,name=opt_sint32,json=optSint32" json:"opt_sint32,omitempty"`
-	OptSint64     *int64   `protobuf:"zigzag64,7,opt,name=opt_sint64,json=optSint64" json:"opt_sint64,omitempty"`
-	OptFixed32    *uint32  `protobuf:"fixed32,8,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
-	OptFixed64    *uint64  `protobuf:"fixed64,9,opt,name=opt_fixed64,json=optFixed64" json:"opt_fixed64,omitempty"`
-	OptSfixed32   *int32   `protobuf:"fixed32,10,opt,name=opt_sfixed32,json=optSfixed32" json:"opt_sfixed32,omitempty"`
-	OptSfixed64   *int64   `protobuf:"fixed64,11,opt,name=opt_sfixed64,json=optSfixed64" json:"opt_sfixed64,omitempty"`
-	OptFloat      *float32 `protobuf:"fixed32,20,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
-	OptDouble     *float64 `protobuf:"fixed64,21,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
-	OptBytes      []byte   `protobuf:"bytes,14,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
-	OptString     *string  `protobuf:"bytes,13,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+
+	OptBool     *bool    `protobuf:"varint,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
+	OptInt32    *int32   `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
+	OptInt64    *int64   `protobuf:"varint,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
+	OptUint32   *uint32  `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
+	OptUint64   *uint64  `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
+	OptSint32   *int32   `protobuf:"zigzag32,6,opt,name=opt_sint32,json=optSint32" json:"opt_sint32,omitempty"`
+	OptSint64   *int64   `protobuf:"zigzag64,7,opt,name=opt_sint64,json=optSint64" json:"opt_sint64,omitempty"`
+	OptFixed32  *uint32  `protobuf:"fixed32,8,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
+	OptFixed64  *uint64  `protobuf:"fixed64,9,opt,name=opt_fixed64,json=optFixed64" json:"opt_fixed64,omitempty"`
+	OptSfixed32 *int32   `protobuf:"fixed32,10,opt,name=opt_sfixed32,json=optSfixed32" json:"opt_sfixed32,omitempty"`
+	OptSfixed64 *int64   `protobuf:"fixed64,11,opt,name=opt_sfixed64,json=optSfixed64" json:"opt_sfixed64,omitempty"`
+	OptFloat    *float32 `protobuf:"fixed32,20,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
+	OptDouble   *float64 `protobuf:"fixed64,21,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
+	OptBytes    []byte   `protobuf:"bytes,14,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
+	OptString   *string  `protobuf:"bytes,13,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 }
 
 func (x *Scalars) Reset() {
@@ -303,6 +310,7 @@ type Enums struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	OptEnum       *Enum              `protobuf:"varint,1,opt,name=opt_enum,json=optEnum,enum=pb2.Enum" json:"opt_enum,omitempty"`
 	RptEnum       []Enum             `protobuf:"varint,2,rep,name=rpt_enum,json=rptEnum,enum=pb2.Enum" json:"rpt_enum,omitempty"`
 	OptNestedEnum *Enums_NestedEnum  `protobuf:"varint,3,opt,name=opt_nested_enum,json=optNestedEnum,enum=pb2.Enums_NestedEnum" json:"opt_nested_enum,omitempty"`
@@ -369,15 +377,16 @@ type Repeats struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	RptBool       []bool    `protobuf:"varint,1,rep,name=rpt_bool,json=rptBool" json:"rpt_bool,omitempty"`
-	RptInt32      []int32   `protobuf:"varint,2,rep,name=rpt_int32,json=rptInt32" json:"rpt_int32,omitempty"`
-	RptInt64      []int64   `protobuf:"varint,3,rep,name=rpt_int64,json=rptInt64" json:"rpt_int64,omitempty"`
-	RptUint32     []uint32  `protobuf:"varint,4,rep,name=rpt_uint32,json=rptUint32" json:"rpt_uint32,omitempty"`
-	RptUint64     []uint64  `protobuf:"varint,5,rep,name=rpt_uint64,json=rptUint64" json:"rpt_uint64,omitempty"`
-	RptFloat      []float32 `protobuf:"fixed32,6,rep,name=rpt_float,json=rptFloat" json:"rpt_float,omitempty"`
-	RptDouble     []float64 `protobuf:"fixed64,7,rep,name=rpt_double,json=rptDouble" json:"rpt_double,omitempty"`
-	RptString     []string  `protobuf:"bytes,8,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
-	RptBytes      [][]byte  `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes" json:"rpt_bytes,omitempty"`
+
+	RptBool   []bool    `protobuf:"varint,1,rep,name=rpt_bool,json=rptBool" json:"rpt_bool,omitempty"`
+	RptInt32  []int32   `protobuf:"varint,2,rep,name=rpt_int32,json=rptInt32" json:"rpt_int32,omitempty"`
+	RptInt64  []int64   `protobuf:"varint,3,rep,name=rpt_int64,json=rptInt64" json:"rpt_int64,omitempty"`
+	RptUint32 []uint32  `protobuf:"varint,4,rep,name=rpt_uint32,json=rptUint32" json:"rpt_uint32,omitempty"`
+	RptUint64 []uint64  `protobuf:"varint,5,rep,name=rpt_uint64,json=rptUint64" json:"rpt_uint64,omitempty"`
+	RptFloat  []float32 `protobuf:"fixed32,6,rep,name=rpt_float,json=rptFloat" json:"rpt_float,omitempty"`
+	RptDouble []float64 `protobuf:"fixed64,7,rep,name=rpt_double,json=rptDouble" json:"rpt_double,omitempty"`
+	RptString []string  `protobuf:"bytes,8,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
+	RptBytes  [][]byte  `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes" json:"rpt_bytes,omitempty"`
 }
 
 func (x *Repeats) Reset() {
@@ -475,8 +484,9 @@ type Nested struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptNested     *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
+
+	OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	OptNested *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
 }
 
 func (x *Nested) Reset() {
@@ -525,10 +535,11 @@ type Nests struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	OptNested     *Nested           `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	Optgroup      *Nests_OptGroup   `protobuf:"group,2,opt,name=OptGroup,json=optgroup" json:"optgroup,omitempty"`
-	RptNested     []*Nested         `protobuf:"bytes,4,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
-	Rptgroup      []*Nests_RptGroup `protobuf:"group,5,rep,name=RptGroup,json=rptgroup" json:"rptgroup,omitempty"`
+
+	OptNested *Nested           `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
+	Optgroup  *Nests_OptGroup   `protobuf:"group,2,opt,name=OptGroup,json=optgroup" json:"optgroup,omitempty"`
+	RptNested []*Nested         `protobuf:"bytes,4,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
+	Rptgroup  []*Nests_RptGroup `protobuf:"group,5,rep,name=RptGroup,json=rptgroup" json:"rptgroup,omitempty"`
 }
 
 func (x *Nests) Reset() {
@@ -591,12 +602,13 @@ type Requireds struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	ReqBool       *bool    `protobuf:"varint,1,req,name=req_bool,json=reqBool" json:"req_bool,omitempty"`
-	ReqSfixed64   *int64   `protobuf:"fixed64,2,req,name=req_sfixed64,json=reqSfixed64" json:"req_sfixed64,omitempty"`
-	ReqDouble     *float64 `protobuf:"fixed64,3,req,name=req_double,json=reqDouble" json:"req_double,omitempty"`
-	ReqString     *string  `protobuf:"bytes,4,req,name=req_string,json=reqString" json:"req_string,omitempty"`
-	ReqEnum       *Enum    `protobuf:"varint,5,req,name=req_enum,json=reqEnum,enum=pb2.Enum" json:"req_enum,omitempty"`
-	ReqNested     *Nested  `protobuf:"bytes,6,req,name=req_nested,json=reqNested" json:"req_nested,omitempty"`
+
+	ReqBool     *bool    `protobuf:"varint,1,req,name=req_bool,json=reqBool" json:"req_bool,omitempty"`
+	ReqSfixed64 *int64   `protobuf:"fixed64,2,req,name=req_sfixed64,json=reqSfixed64" json:"req_sfixed64,omitempty"`
+	ReqDouble   *float64 `protobuf:"fixed64,3,req,name=req_double,json=reqDouble" json:"req_double,omitempty"`
+	ReqString   *string  `protobuf:"bytes,4,req,name=req_string,json=reqString" json:"req_string,omitempty"`
+	ReqEnum     *Enum    `protobuf:"varint,5,req,name=req_enum,json=reqEnum,enum=pb2.Enum" json:"req_enum,omitempty"`
+	ReqNested   *Nested  `protobuf:"bytes,6,req,name=req_nested,json=reqNested" json:"req_nested,omitempty"`
 }
 
 func (x *Requireds) Reset() {
@@ -673,8 +685,9 @@ type PartialRequired struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	ReqString     *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
-	OptString     *string `protobuf:"bytes,2,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+
+	ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
+	OptString *string `protobuf:"bytes,2,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 }
 
 func (x *PartialRequired) Reset() {
@@ -722,7 +735,8 @@ type NestedWithRequired struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	ReqString     *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
+
+	ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
 }
 
 func (x *NestedWithRequired) Reset() {
@@ -763,10 +777,11 @@ type IndirectRequired struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	OptNested     *NestedWithRequired            `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
-	RptNested     []*NestedWithRequired          `protobuf:"bytes,2,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
-	StrToNested   map[string]*NestedWithRequired `protobuf:"bytes,3,rep,name=str_to_nested,json=strToNested" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Types that are valid to be assigned to Union:
+
+	OptNested   *NestedWithRequired            `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
+	RptNested   []*NestedWithRequired          `protobuf:"bytes,2,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
+	StrToNested map[string]*NestedWithRequired `protobuf:"bytes,3,rep,name=str_to_nested,json=strToNested" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// Types that are assignable to Union:
 	//	*IndirectRequired_OneofNested
 	Union isIndirectRequired_Union `protobuf_oneof:"union"`
 }
@@ -848,9 +863,10 @@ type Extensions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	OptString       *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptBool         *bool   `protobuf:"varint,101,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32        *int32  `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
+
+	OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	OptBool   *bool   `protobuf:"varint,101,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
+	OptInt32  *int32  `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
 }
 
 func (x *Extensions) Reset() {
@@ -990,7 +1006,8 @@ type MessageSetExtension struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+
+	OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 }
 
 func (x *MessageSetExtension) Reset() {
@@ -1074,7 +1091,8 @@ type FakeMessageSetExtension struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	OptString     *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+
+	OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 }
 
 func (x *FakeMessageSetExtension) Reset() {
@@ -1116,24 +1134,25 @@ type KnownTypes struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	OptBool       *wrapperspb.BoolValue   `protobuf:"bytes,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
-	OptInt32      *wrapperspb.Int32Value  `protobuf:"bytes,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
-	OptInt64      *wrapperspb.Int64Value  `protobuf:"bytes,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
-	OptUint32     *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
-	OptUint64     *wrapperspb.UInt64Value `protobuf:"bytes,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
-	OptFloat      *wrapperspb.FloatValue  `protobuf:"bytes,6,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
-	OptDouble     *wrapperspb.DoubleValue `protobuf:"bytes,7,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
-	OptString     *wrapperspb.StringValue `protobuf:"bytes,8,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
-	OptBytes      *wrapperspb.BytesValue  `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
-	OptDuration   *durationpb.Duration    `protobuf:"bytes,20,opt,name=opt_duration,json=optDuration" json:"opt_duration,omitempty"`
-	OptTimestamp  *timestamppb.Timestamp  `protobuf:"bytes,21,opt,name=opt_timestamp,json=optTimestamp" json:"opt_timestamp,omitempty"`
-	OptStruct     *structpb.Struct        `protobuf:"bytes,25,opt,name=opt_struct,json=optStruct" json:"opt_struct,omitempty"`
-	OptList       *structpb.ListValue     `protobuf:"bytes,26,opt,name=opt_list,json=optList" json:"opt_list,omitempty"`
-	OptValue      *structpb.Value         `protobuf:"bytes,27,opt,name=opt_value,json=optValue" json:"opt_value,omitempty"`
-	OptNull       *structpb.NullValue     `protobuf:"varint,28,opt,name=opt_null,json=optNull,enum=google.protobuf.NullValue" json:"opt_null,omitempty"`
-	OptEmpty      *emptypb.Empty          `protobuf:"bytes,30,opt,name=opt_empty,json=optEmpty" json:"opt_empty,omitempty"`
-	OptAny        *anypb.Any              `protobuf:"bytes,32,opt,name=opt_any,json=optAny" json:"opt_any,omitempty"`
-	OptFieldmask  *fieldmaskpb.FieldMask  `protobuf:"bytes,40,opt,name=opt_fieldmask,json=optFieldmask" json:"opt_fieldmask,omitempty"`
+
+	OptBool      *wrapperspb.BoolValue   `protobuf:"bytes,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
+	OptInt32     *wrapperspb.Int32Value  `protobuf:"bytes,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
+	OptInt64     *wrapperspb.Int64Value  `protobuf:"bytes,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
+	OptUint32    *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
+	OptUint64    *wrapperspb.UInt64Value `protobuf:"bytes,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
+	OptFloat     *wrapperspb.FloatValue  `protobuf:"bytes,6,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
+	OptDouble    *wrapperspb.DoubleValue `protobuf:"bytes,7,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
+	OptString    *wrapperspb.StringValue `protobuf:"bytes,8,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
+	OptBytes     *wrapperspb.BytesValue  `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
+	OptDuration  *durationpb.Duration    `protobuf:"bytes,20,opt,name=opt_duration,json=optDuration" json:"opt_duration,omitempty"`
+	OptTimestamp *timestamppb.Timestamp  `protobuf:"bytes,21,opt,name=opt_timestamp,json=optTimestamp" json:"opt_timestamp,omitempty"`
+	OptStruct    *structpb.Struct        `protobuf:"bytes,25,opt,name=opt_struct,json=optStruct" json:"opt_struct,omitempty"`
+	OptList      *structpb.ListValue     `protobuf:"bytes,26,opt,name=opt_list,json=optList" json:"opt_list,omitempty"`
+	OptValue     *structpb.Value         `protobuf:"bytes,27,opt,name=opt_value,json=optValue" json:"opt_value,omitempty"`
+	OptNull      *structpb.NullValue     `protobuf:"varint,28,opt,name=opt_null,json=optNull,enum=google.protobuf.NullValue" json:"opt_null,omitempty"`
+	OptEmpty     *emptypb.Empty          `protobuf:"bytes,30,opt,name=opt_empty,json=optEmpty" json:"opt_empty,omitempty"`
+	OptAny       *anypb.Any              `protobuf:"bytes,32,opt,name=opt_any,json=optAny" json:"opt_any,omitempty"`
+	OptFieldmask *fieldmaskpb.FieldMask  `protobuf:"bytes,40,opt,name=opt_fieldmask,json=optFieldmask" json:"opt_fieldmask,omitempty"`
 }
 
 func (x *KnownTypes) Reset() {
@@ -1290,9 +1309,10 @@ func (x *KnownTypes) GetOptFieldmask() *fieldmaskpb.FieldMask {
 }
 
 type Nests_OptGroup struct {
-	state          protoimpl.MessageState
-	sizeCache      protoimpl.SizeCache
-	unknownFields  protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	OptString      *string                        `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
 	OptNested      *Nested                        `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
 	Optnestedgroup *Nests_OptGroup_OptNestedGroup `protobuf:"group,3,opt,name=OptNestedGroup,json=optnestedgroup" json:"optnestedgroup,omitempty"`
@@ -1350,7 +1370,8 @@ type Nests_RptGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	RptString     []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
+
+	RptString []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
 }
 
 func (x *Nests_RptGroup) Reset() {
@@ -1391,7 +1412,8 @@ type Nests_OptGroup_OptNestedGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	OptFixed32    *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
+
+	OptFixed32 *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
 }
 
 func (x *Nests_OptGroup_OptNestedGroup) Reset() {

encoding/testprotos/pb3/test.pb.go

@@ -1,3 +1,9 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Test Protobuf definitions with proto3 syntax.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: pb3/test.proto
 
@@ -127,21 +133,22 @@ type Scalars struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	SBool         bool    `protobuf:"varint,1,opt,name=s_bool,json=sBool,proto3" json:"s_bool,omitempty"`
-	SInt32        int32   `protobuf:"varint,2,opt,name=s_int32,json=sInt32,proto3" json:"s_int32,omitempty"`
-	SInt64        int64   `protobuf:"varint,3,opt,name=s_int64,json=sInt64,proto3" json:"s_int64,omitempty"`
-	SUint32       uint32  `protobuf:"varint,4,opt,name=s_uint32,json=sUint32,proto3" json:"s_uint32,omitempty"`
-	SUint64       uint64  `protobuf:"varint,5,opt,name=s_uint64,json=sUint64,proto3" json:"s_uint64,omitempty"`
-	SSint32       int32   `protobuf:"zigzag32,6,opt,name=s_sint32,json=sSint32,proto3" json:"s_sint32,omitempty"`
-	SSint64       int64   `protobuf:"zigzag64,7,opt,name=s_sint64,json=sSint64,proto3" json:"s_sint64,omitempty"`
-	SFixed32      uint32  `protobuf:"fixed32,8,opt,name=s_fixed32,json=sFixed32,proto3" json:"s_fixed32,omitempty"`
-	SFixed64      uint64  `protobuf:"fixed64,9,opt,name=s_fixed64,json=sFixed64,proto3" json:"s_fixed64,omitempty"`
-	SSfixed32     int32   `protobuf:"fixed32,10,opt,name=s_sfixed32,json=sSfixed32,proto3" json:"s_sfixed32,omitempty"`
-	SSfixed64     int64   `protobuf:"fixed64,11,opt,name=s_sfixed64,json=sSfixed64,proto3" json:"s_sfixed64,omitempty"`
-	SFloat        float32 `protobuf:"fixed32,20,opt,name=s_float,json=sFloat,proto3" json:"s_float,omitempty"`
-	SDouble       float64 `protobuf:"fixed64,21,opt,name=s_double,json=sDouble,proto3" json:"s_double,omitempty"`
-	SBytes        []byte  `protobuf:"bytes,14,opt,name=s_bytes,json=sBytes,proto3" json:"s_bytes,omitempty"`
-	SString       string  `protobuf:"bytes,13,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
+
+	SBool     bool    `protobuf:"varint,1,opt,name=s_bool,json=sBool,proto3" json:"s_bool,omitempty"`
+	SInt32    int32   `protobuf:"varint,2,opt,name=s_int32,json=sInt32,proto3" json:"s_int32,omitempty"`
+	SInt64    int64   `protobuf:"varint,3,opt,name=s_int64,json=sInt64,proto3" json:"s_int64,omitempty"`
+	SUint32   uint32  `protobuf:"varint,4,opt,name=s_uint32,json=sUint32,proto3" json:"s_uint32,omitempty"`
+	SUint64   uint64  `protobuf:"varint,5,opt,name=s_uint64,json=sUint64,proto3" json:"s_uint64,omitempty"`
+	SSint32   int32   `protobuf:"zigzag32,6,opt,name=s_sint32,json=sSint32,proto3" json:"s_sint32,omitempty"`
+	SSint64   int64   `protobuf:"zigzag64,7,opt,name=s_sint64,json=sSint64,proto3" json:"s_sint64,omitempty"`
+	SFixed32  uint32  `protobuf:"fixed32,8,opt,name=s_fixed32,json=sFixed32,proto3" json:"s_fixed32,omitempty"`
+	SFixed64  uint64  `protobuf:"fixed64,9,opt,name=s_fixed64,json=sFixed64,proto3" json:"s_fixed64,omitempty"`
+	SSfixed32 int32   `protobuf:"fixed32,10,opt,name=s_sfixed32,json=sSfixed32,proto3" json:"s_sfixed32,omitempty"`
+	SSfixed64 int64   `protobuf:"fixed64,11,opt,name=s_sfixed64,json=sSfixed64,proto3" json:"s_sfixed64,omitempty"`
+	SFloat    float32 `protobuf:"fixed32,20,opt,name=s_float,json=sFloat,proto3" json:"s_float,omitempty"`
+	SDouble   float64 `protobuf:"fixed64,21,opt,name=s_double,json=sDouble,proto3" json:"s_double,omitempty"`
+	SBytes    []byte  `protobuf:"bytes,14,opt,name=s_bytes,json=sBytes,proto3" json:"s_bytes,omitempty"`
+	SString   string  `protobuf:"bytes,13,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
 }
 
 func (x *Scalars) Reset() {
@@ -281,8 +288,9 @@ type Enums struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	SEnum         Enum             `protobuf:"varint,1,opt,name=s_enum,json=sEnum,proto3,enum=pb3.Enum" json:"s_enum,omitempty"`
-	SNestedEnum   Enums_NestedEnum `protobuf:"varint,3,opt,name=s_nested_enum,json=sNestedEnum,proto3,enum=pb3.Enums_NestedEnum" json:"s_nested_enum,omitempty"`
+
+	SEnum       Enum             `protobuf:"varint,1,opt,name=s_enum,json=sEnum,proto3,enum=pb3.Enum" json:"s_enum,omitempty"`
+	SNestedEnum Enums_NestedEnum `protobuf:"varint,3,opt,name=s_nested_enum,json=sNestedEnum,proto3,enum=pb3.Enums_NestedEnum" json:"s_nested_enum,omitempty"`
 }
 
 func (x *Enums) Reset() {
@@ -331,7 +339,8 @@ type Nests struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	SNested       *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
+
+	SNested *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
 }
 
 func (x *Nests) Reset() {
@@ -373,8 +382,9 @@ type Nested struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	SString       string  `protobuf:"bytes,1,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
-	SNested       *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
+
+	SString string  `protobuf:"bytes,1,opt,name=s_string,json=sString,proto3" json:"s_string,omitempty"`
+	SNested *Nested `protobuf:"bytes,2,opt,name=s_nested,json=sNested,proto3" json:"s_nested,omitempty"`
 }
 
 func (x *Nested) Reset() {
@@ -423,7 +433,8 @@ type Oneofs struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	// Types that are valid to be assigned to Union:
+
+	// Types that are assignable to Union:
 	//	*Oneofs_OneofEnum
 	//	*Oneofs_OneofString
 	//	*Oneofs_OneofNested
@@ -512,11 +523,12 @@ type Maps struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Int32ToStr    map[int32]string   `protobuf:"bytes,1,rep,name=int32_to_str,json=int32ToStr,proto3" json:"int32_to_str,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	BoolToUint32  map[bool]uint32    `protobuf:"bytes,2,rep,name=bool_to_uint32,json=boolToUint32,proto3" json:"bool_to_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
-	Uint64ToEnum  map[uint64]Enum    `protobuf:"bytes,3,rep,name=uint64_to_enum,json=uint64ToEnum,proto3" json:"uint64_to_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=pb3.Enum"`
-	StrToNested   map[string]*Nested `protobuf:"bytes,4,rep,name=str_to_nested,json=strToNested,proto3" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	StrToOneofs   map[string]*Oneofs `protobuf:"bytes,5,rep,name=str_to_oneofs,json=strToOneofs,proto3" json:"str_to_oneofs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+
+	Int32ToStr   map[int32]string   `protobuf:"bytes,1,rep,name=int32_to_str,json=int32ToStr,proto3" json:"int32_to_str,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	BoolToUint32 map[bool]uint32    `protobuf:"bytes,2,rep,name=bool_to_uint32,json=boolToUint32,proto3" json:"bool_to_uint32,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Uint64ToEnum map[uint64]Enum    `protobuf:"bytes,3,rep,name=uint64_to_enum,json=uint64ToEnum,proto3" json:"uint64_to_enum,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=pb3.Enum"`
+	StrToNested  map[string]*Nested `protobuf:"bytes,4,rep,name=str_to_nested,json=strToNested,proto3" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	StrToOneofs  map[string]*Oneofs `protobuf:"bytes,5,rep,name=str_to_oneofs,json=strToOneofs,proto3" json:"str_to_oneofs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *Maps) Reset() {
@@ -586,7 +598,8 @@ type JSONNames struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	SString       string `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"`
+
+	SString string `protobuf:"bytes,1,opt,name=s_string,json=foo_bar,proto3" json:"s_string,omitempty"`
 }
 
 func (x *JSONNames) Reset() {

internal/testprotos/benchmarks/benchmarks.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: benchmarks.proto
 
@@ -21,6 +51,7 @@ type BenchmarkDataset struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Name of the benchmark dataset.  This should be unique across all datasets.
 	// Should only contain word characters: [a-zA-Z0-9_]
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`

internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go

@@ -1,3 +1,5 @@
+// Benchmark messages for proto2.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: datasets/google_message1/proto2/benchmark_message1_proto2.proto
 
@@ -21,47 +23,48 @@ type GoogleMessage1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1        *string                   `protobuf:"bytes,1,req,name=field1" json:"field1,omitempty"`
-	Field9        *string                   `protobuf:"bytes,9,opt,name=field9" json:"field9,omitempty"`
-	Field18       *string                   `protobuf:"bytes,18,opt,name=field18" json:"field18,omitempty"`
-	Field80       *bool                     `protobuf:"varint,80,opt,name=field80,def=0" json:"field80,omitempty"`
-	Field81       *bool                     `protobuf:"varint,81,opt,name=field81,def=1" json:"field81,omitempty"`
-	Field2        *int32                    `protobuf:"varint,2,req,name=field2" json:"field2,omitempty"`
-	Field3        *int32                    `protobuf:"varint,3,req,name=field3" json:"field3,omitempty"`
-	Field280      *int32                    `protobuf:"varint,280,opt,name=field280" json:"field280,omitempty"`
-	Field6        *int32                    `protobuf:"varint,6,opt,name=field6,def=0" json:"field6,omitempty"`
-	Field22       *int64                    `protobuf:"varint,22,opt,name=field22" json:"field22,omitempty"`
-	Field4        *string                   `protobuf:"bytes,4,opt,name=field4" json:"field4,omitempty"`
-	Field5        []uint64                  `protobuf:"fixed64,5,rep,name=field5" json:"field5,omitempty"`
-	Field59       *bool                     `protobuf:"varint,59,opt,name=field59,def=0" json:"field59,omitempty"`
-	Field7        *string                   `protobuf:"bytes,7,opt,name=field7" json:"field7,omitempty"`
-	Field16       *int32                    `protobuf:"varint,16,opt,name=field16" json:"field16,omitempty"`
-	Field130      *int32                    `protobuf:"varint,130,opt,name=field130,def=0" json:"field130,omitempty"`
-	Field12       *bool                     `protobuf:"varint,12,opt,name=field12,def=1" json:"field12,omitempty"`
-	Field17       *bool                     `protobuf:"varint,17,opt,name=field17,def=1" json:"field17,omitempty"`
-	Field13       *bool                     `protobuf:"varint,13,opt,name=field13,def=1" json:"field13,omitempty"`
-	Field14       *bool                     `protobuf:"varint,14,opt,name=field14,def=1" json:"field14,omitempty"`
-	Field104      *int32                    `protobuf:"varint,104,opt,name=field104,def=0" json:"field104,omitempty"`
-	Field100      *int32                    `protobuf:"varint,100,opt,name=field100,def=0" json:"field100,omitempty"`
-	Field101      *int32                    `protobuf:"varint,101,opt,name=field101,def=0" json:"field101,omitempty"`
-	Field102      *string                   `protobuf:"bytes,102,opt,name=field102" json:"field102,omitempty"`
-	Field103      *string                   `protobuf:"bytes,103,opt,name=field103" json:"field103,omitempty"`
-	Field29       *int32                    `protobuf:"varint,29,opt,name=field29,def=0" json:"field29,omitempty"`
-	Field30       *bool                     `protobuf:"varint,30,opt,name=field30,def=0" json:"field30,omitempty"`
-	Field60       *int32                    `protobuf:"varint,60,opt,name=field60,def=-1" json:"field60,omitempty"`
-	Field271      *int32                    `protobuf:"varint,271,opt,name=field271,def=-1" json:"field271,omitempty"`
-	Field272      *int32                    `protobuf:"varint,272,opt,name=field272,def=-1" json:"field272,omitempty"`
-	Field150      *int32                    `protobuf:"varint,150,opt,name=field150" json:"field150,omitempty"`
-	Field23       *int32                    `protobuf:"varint,23,opt,name=field23,def=0" json:"field23,omitempty"`
-	Field24       *bool                     `protobuf:"varint,24,opt,name=field24,def=0" json:"field24,omitempty"`
-	Field25       *int32                    `protobuf:"varint,25,opt,name=field25,def=0" json:"field25,omitempty"`
-	Field15       *GoogleMessage1SubMessage `protobuf:"bytes,15,opt,name=field15" json:"field15,omitempty"`
-	Field78       *bool                     `protobuf:"varint,78,opt,name=field78" json:"field78,omitempty"`
-	Field67       *int32                    `protobuf:"varint,67,opt,name=field67,def=0" json:"field67,omitempty"`
-	Field68       *int32                    `protobuf:"varint,68,opt,name=field68" json:"field68,omitempty"`
-	Field128      *int32                    `protobuf:"varint,128,opt,name=field128,def=0" json:"field128,omitempty"`
-	Field129      *string                   `protobuf:"bytes,129,opt,name=field129,def=xxxxxxxxxxxxxxxxxxxxx" json:"field129,omitempty"`
-	Field131      *int32                    `protobuf:"varint,131,opt,name=field131,def=0" json:"field131,omitempty"`
+
+	Field1   *string                   `protobuf:"bytes,1,req,name=field1" json:"field1,omitempty"`
+	Field9   *string                   `protobuf:"bytes,9,opt,name=field9" json:"field9,omitempty"`
+	Field18  *string                   `protobuf:"bytes,18,opt,name=field18" json:"field18,omitempty"`
+	Field80  *bool                     `protobuf:"varint,80,opt,name=field80,def=0" json:"field80,omitempty"`
+	Field81  *bool                     `protobuf:"varint,81,opt,name=field81,def=1" json:"field81,omitempty"`
+	Field2   *int32                    `protobuf:"varint,2,req,name=field2" json:"field2,omitempty"`
+	Field3   *int32                    `protobuf:"varint,3,req,name=field3" json:"field3,omitempty"`
+	Field280 *int32                    `protobuf:"varint,280,opt,name=field280" json:"field280,omitempty"`
+	Field6   *int32                    `protobuf:"varint,6,opt,name=field6,def=0" json:"field6,omitempty"`
+	Field22  *int64                    `protobuf:"varint,22,opt,name=field22" json:"field22,omitempty"`
+	Field4   *string                   `protobuf:"bytes,4,opt,name=field4" json:"field4,omitempty"`
+	Field5   []uint64                  `protobuf:"fixed64,5,rep,name=field5" json:"field5,omitempty"`
+	Field59  *bool                     `protobuf:"varint,59,opt,name=field59,def=0" json:"field59,omitempty"`
+	Field7   *string                   `protobuf:"bytes,7,opt,name=field7" json:"field7,omitempty"`
+	Field16  *int32                    `protobuf:"varint,16,opt,name=field16" json:"field16,omitempty"`
+	Field130 *int32                    `protobuf:"varint,130,opt,name=field130,def=0" json:"field130,omitempty"`
+	Field12  *bool                     `protobuf:"varint,12,opt,name=field12,def=1" json:"field12,omitempty"`
+	Field17  *bool                     `protobuf:"varint,17,opt,name=field17,def=1" json:"field17,omitempty"`
+	Field13  *bool                     `protobuf:"varint,13,opt,name=field13,def=1" json:"field13,omitempty"`
+	Field14  *bool                     `protobuf:"varint,14,opt,name=field14,def=1" json:"field14,omitempty"`
+	Field104 *int32                    `protobuf:"varint,104,opt,name=field104,def=0" json:"field104,omitempty"`
+	Field100 *int32                    `protobuf:"varint,100,opt,name=field100,def=0" json:"field100,omitempty"`
+	Field101 *int32                    `protobuf:"varint,101,opt,name=field101,def=0" json:"field101,omitempty"`
+	Field102 *string                   `protobuf:"bytes,102,opt,name=field102" json:"field102,omitempty"`
+	Field103 *string                   `protobuf:"bytes,103,opt,name=field103" json:"field103,omitempty"`
+	Field29  *int32                    `protobuf:"varint,29,opt,name=field29,def=0" json:"field29,omitempty"`
+	Field30  *bool                     `protobuf:"varint,30,opt,name=field30,def=0" json:"field30,omitempty"`
+	Field60  *int32                    `protobuf:"varint,60,opt,name=field60,def=-1" json:"field60,omitempty"`
+	Field271 *int32                    `protobuf:"varint,271,opt,name=field271,def=-1" json:"field271,omitempty"`
+	Field272 *int32                    `protobuf:"varint,272,opt,name=field272,def=-1" json:"field272,omitempty"`
+	Field150 *int32                    `protobuf:"varint,150,opt,name=field150" json:"field150,omitempty"`
+	Field23  *int32                    `protobuf:"varint,23,opt,name=field23,def=0" json:"field23,omitempty"`
+	Field24  *bool                     `protobuf:"varint,24,opt,name=field24,def=0" json:"field24,omitempty"`
+	Field25  *int32                    `protobuf:"varint,25,opt,name=field25,def=0" json:"field25,omitempty"`
+	Field15  *GoogleMessage1SubMessage `protobuf:"bytes,15,opt,name=field15" json:"field15,omitempty"`
+	Field78  *bool                     `protobuf:"varint,78,opt,name=field78" json:"field78,omitempty"`
+	Field67  *int32                    `protobuf:"varint,67,opt,name=field67,def=0" json:"field67,omitempty"`
+	Field68  *int32                    `protobuf:"varint,68,opt,name=field68" json:"field68,omitempty"`
+	Field128 *int32                    `protobuf:"varint,128,opt,name=field128,def=0" json:"field128,omitempty"`
+	Field129 *string                   `protobuf:"bytes,129,opt,name=field129,def=xxxxxxxxxxxxxxxxxxxxx" json:"field129,omitempty"`
+	Field131 *int32                    `protobuf:"varint,131,opt,name=field131,def=0" json:"field131,omitempty"`
 }
 
 // Default values for GoogleMessage1 fields.
@@ -410,26 +413,27 @@ type GoogleMessage1SubMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1        *int32  `protobuf:"varint,1,opt,name=field1,def=0" json:"field1,omitempty"`
-	Field2        *int32  `protobuf:"varint,2,opt,name=field2,def=0" json:"field2,omitempty"`
-	Field3        *int32  `protobuf:"varint,3,opt,name=field3,def=0" json:"field3,omitempty"`
-	Field15       *string `protobuf:"bytes,15,opt,name=field15" json:"field15,omitempty"`
-	Field12       *bool   `protobuf:"varint,12,opt,name=field12,def=1" json:"field12,omitempty"`
-	Field13       *int64  `protobuf:"varint,13,opt,name=field13" json:"field13,omitempty"`
-	Field14       *int64  `protobuf:"varint,14,opt,name=field14" json:"field14,omitempty"`
-	Field16       *int32  `protobuf:"varint,16,opt,name=field16" json:"field16,omitempty"`
-	Field19       *int32  `protobuf:"varint,19,opt,name=field19,def=2" json:"field19,omitempty"`
-	Field20       *bool   `protobuf:"varint,20,opt,name=field20,def=1" json:"field20,omitempty"`
-	Field28       *bool   `protobuf:"varint,28,opt,name=field28,def=1" json:"field28,omitempty"`
-	Field21       *uint64 `protobuf:"fixed64,21,opt,name=field21" json:"field21,omitempty"`
-	Field22       *int32  `protobuf:"varint,22,opt,name=field22" json:"field22,omitempty"`
-	Field23       *bool   `protobuf:"varint,23,opt,name=field23,def=0" json:"field23,omitempty"`
-	Field206      *bool   `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
-	Field203      *uint32 `protobuf:"fixed32,203,opt,name=field203" json:"field203,omitempty"`
-	Field204      *int32  `protobuf:"varint,204,opt,name=field204" json:"field204,omitempty"`
-	Field205      *string `protobuf:"bytes,205,opt,name=field205" json:"field205,omitempty"`
-	Field207      *uint64 `protobuf:"varint,207,opt,name=field207" json:"field207,omitempty"`
-	Field300      *uint64 `protobuf:"varint,300,opt,name=field300" json:"field300,omitempty"`
+
+	Field1   *int32  `protobuf:"varint,1,opt,name=field1,def=0" json:"field1,omitempty"`
+	Field2   *int32  `protobuf:"varint,2,opt,name=field2,def=0" json:"field2,omitempty"`
+	Field3   *int32  `protobuf:"varint,3,opt,name=field3,def=0" json:"field3,omitempty"`
+	Field15  *string `protobuf:"bytes,15,opt,name=field15" json:"field15,omitempty"`
+	Field12  *bool   `protobuf:"varint,12,opt,name=field12,def=1" json:"field12,omitempty"`
+	Field13  *int64  `protobuf:"varint,13,opt,name=field13" json:"field13,omitempty"`
+	Field14  *int64  `protobuf:"varint,14,opt,name=field14" json:"field14,omitempty"`
+	Field16  *int32  `protobuf:"varint,16,opt,name=field16" json:"field16,omitempty"`
+	Field19  *int32  `protobuf:"varint,19,opt,name=field19,def=2" json:"field19,omitempty"`
+	Field20  *bool   `protobuf:"varint,20,opt,name=field20,def=1" json:"field20,omitempty"`
+	Field28  *bool   `protobuf:"varint,28,opt,name=field28,def=1" json:"field28,omitempty"`
+	Field21  *uint64 `protobuf:"fixed64,21,opt,name=field21" json:"field21,omitempty"`
+	Field22  *int32  `protobuf:"varint,22,opt,name=field22" json:"field22,omitempty"`
+	Field23  *bool   `protobuf:"varint,23,opt,name=field23,def=0" json:"field23,omitempty"`
+	Field206 *bool   `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
+	Field203 *uint32 `protobuf:"fixed32,203,opt,name=field203" json:"field203,omitempty"`
+	Field204 *int32  `protobuf:"varint,204,opt,name=field204" json:"field204,omitempty"`
+	Field205 *string `protobuf:"bytes,205,opt,name=field205" json:"field205,omitempty"`
+	Field207 *uint64 `protobuf:"varint,207,opt,name=field207" json:"field207,omitempty"`
+	Field300 *uint64 `protobuf:"varint,300,opt,name=field300" json:"field300,omitempty"`
 }
 
 // Default values for GoogleMessage1SubMessage fields.

internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go

@@ -1,3 +1,5 @@
+// Benchmark messages for proto3.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: datasets/google_message1/proto3/benchmark_message1_proto3.proto
 
@@ -21,47 +23,48 @@ type GoogleMessage1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1        string                    `protobuf:"bytes,1,opt,name=field1,proto3" json:"field1,omitempty"`
-	Field9        string                    `protobuf:"bytes,9,opt,name=field9,proto3" json:"field9,omitempty"`
-	Field18       string                    `protobuf:"bytes,18,opt,name=field18,proto3" json:"field18,omitempty"`
-	Field80       bool                      `protobuf:"varint,80,opt,name=field80,proto3" json:"field80,omitempty"`
-	Field81       bool                      `protobuf:"varint,81,opt,name=field81,proto3" json:"field81,omitempty"`
-	Field2        int32                     `protobuf:"varint,2,opt,name=field2,proto3" json:"field2,omitempty"`
-	Field3        int32                     `protobuf:"varint,3,opt,name=field3,proto3" json:"field3,omitempty"`
-	Field280      int32                     `protobuf:"varint,280,opt,name=field280,proto3" json:"field280,omitempty"`
-	Field6        int32                     `protobuf:"varint,6,opt,name=field6,proto3" json:"field6,omitempty"`
-	Field22       int64                     `protobuf:"varint,22,opt,name=field22,proto3" json:"field22,omitempty"`
-	Field4        string                    `protobuf:"bytes,4,opt,name=field4,proto3" json:"field4,omitempty"`
-	Field5        []uint64                  `protobuf:"fixed64,5,rep,packed,name=field5,proto3" json:"field5,omitempty"`
-	Field59       bool                      `protobuf:"varint,59,opt,name=field59,proto3" json:"field59,omitempty"`
-	Field7        string                    `protobuf:"bytes,7,opt,name=field7,proto3" json:"field7,omitempty"`
-	Field16       int32                     `protobuf:"varint,16,opt,name=field16,proto3" json:"field16,omitempty"`
-	Field130      int32                     `protobuf:"varint,130,opt,name=field130,proto3" json:"field130,omitempty"`
-	Field12       bool                      `protobuf:"varint,12,opt,name=field12,proto3" json:"field12,omitempty"`
-	Field17       bool                      `protobuf:"varint,17,opt,name=field17,proto3" json:"field17,omitempty"`
-	Field13       bool                      `protobuf:"varint,13,opt,name=field13,proto3" json:"field13,omitempty"`
-	Field14       bool                      `protobuf:"varint,14,opt,name=field14,proto3" json:"field14,omitempty"`
-	Field104      int32                     `protobuf:"varint,104,opt,name=field104,proto3" json:"field104,omitempty"`
-	Field100      int32                     `protobuf:"varint,100,opt,name=field100,proto3" json:"field100,omitempty"`
-	Field101      int32                     `protobuf:"varint,101,opt,name=field101,proto3" json:"field101,omitempty"`
-	Field102      string                    `protobuf:"bytes,102,opt,name=field102,proto3" json:"field102,omitempty"`
-	Field103      string                    `protobuf:"bytes,103,opt,name=field103,proto3" json:"field103,omitempty"`
-	Field29       int32                     `protobuf:"varint,29,opt,name=field29,proto3" json:"field29,omitempty"`
-	Field30       bool                      `protobuf:"varint,30,opt,name=field30,proto3" json:"field30,omitempty"`
-	Field60       int32                     `protobuf:"varint,60,opt,name=field60,proto3" json:"field60,omitempty"`
-	Field271      int32                     `protobuf:"varint,271,opt,name=field271,proto3" json:"field271,omitempty"`
-	Field272      int32                     `protobuf:"varint,272,opt,name=field272,proto3" json:"field272,omitempty"`
-	Field150      int32                     `protobuf:"varint,150,opt,name=field150,proto3" json:"field150,omitempty"`
-	Field23       int32                     `protobuf:"varint,23,opt,name=field23,proto3" json:"field23,omitempty"`
-	Field24       bool                      `protobuf:"varint,24,opt,name=field24,proto3" json:"field24,omitempty"`
-	Field25       int32                     `protobuf:"varint,25,opt,name=field25,proto3" json:"field25,omitempty"`
-	Field15       *GoogleMessage1SubMessage `protobuf:"bytes,15,opt,name=field15,proto3" json:"field15,omitempty"`
-	Field78       bool                      `protobuf:"varint,78,opt,name=field78,proto3" json:"field78,omitempty"`
-	Field67       int32                     `protobuf:"varint,67,opt,name=field67,proto3" json:"field67,omitempty"`
-	Field68       int32                     `protobuf:"varint,68,opt,name=field68,proto3" json:"field68,omitempty"`
-	Field128      int32                     `protobuf:"varint,128,opt,name=field128,proto3" json:"field128,omitempty"`
-	Field129      string                    `protobuf:"bytes,129,opt,name=field129,proto3" json:"field129,omitempty"`
-	Field131      int32                     `protobuf:"varint,131,opt,name=field131,proto3" json:"field131,omitempty"`
+
+	Field1   string                    `protobuf:"bytes,1,opt,name=field1,proto3" json:"field1,omitempty"`
+	Field9   string                    `protobuf:"bytes,9,opt,name=field9,proto3" json:"field9,omitempty"`
+	Field18  string                    `protobuf:"bytes,18,opt,name=field18,proto3" json:"field18,omitempty"`
+	Field80  bool                      `protobuf:"varint,80,opt,name=field80,proto3" json:"field80,omitempty"`
+	Field81  bool                      `protobuf:"varint,81,opt,name=field81,proto3" json:"field81,omitempty"`
+	Field2   int32                     `protobuf:"varint,2,opt,name=field2,proto3" json:"field2,omitempty"`
+	Field3   int32                     `protobuf:"varint,3,opt,name=field3,proto3" json:"field3,omitempty"`
+	Field280 int32                     `protobuf:"varint,280,opt,name=field280,proto3" json:"field280,omitempty"`
+	Field6   int32                     `protobuf:"varint,6,opt,name=field6,proto3" json:"field6,omitempty"`
+	Field22  int64                     `protobuf:"varint,22,opt,name=field22,proto3" json:"field22,omitempty"`
+	Field4   string                    `protobuf:"bytes,4,opt,name=field4,proto3" json:"field4,omitempty"`
+	Field5   []uint64                  `protobuf:"fixed64,5,rep,packed,name=field5,proto3" json:"field5,omitempty"`
+	Field59  bool                      `protobuf:"varint,59,opt,name=field59,proto3" json:"field59,omitempty"`
+	Field7   string                    `protobuf:"bytes,7,opt,name=field7,proto3" json:"field7,omitempty"`
+	Field16  int32                     `protobuf:"varint,16,opt,name=field16,proto3" json:"field16,omitempty"`
+	Field130 int32                     `protobuf:"varint,130,opt,name=field130,proto3" json:"field130,omitempty"`
+	Field12  bool                      `protobuf:"varint,12,opt,name=field12,proto3" json:"field12,omitempty"`
+	Field17  bool                      `protobuf:"varint,17,opt,name=field17,proto3" json:"field17,omitempty"`
+	Field13  bool                      `protobuf:"varint,13,opt,name=field13,proto3" json:"field13,omitempty"`
+	Field14  bool                      `protobuf:"varint,14,opt,name=field14,proto3" json:"field14,omitempty"`
+	Field104 int32                     `protobuf:"varint,104,opt,name=field104,proto3" json:"field104,omitempty"`
+	Field100 int32                     `protobuf:"varint,100,opt,name=field100,proto3" json:"field100,omitempty"`
+	Field101 int32                     `protobuf:"varint,101,opt,name=field101,proto3" json:"field101,omitempty"`
+	Field102 string                    `protobuf:"bytes,102,opt,name=field102,proto3" json:"field102,omitempty"`
+	Field103 string                    `protobuf:"bytes,103,opt,name=field103,proto3" json:"field103,omitempty"`
+	Field29  int32                     `protobuf:"varint,29,opt,name=field29,proto3" json:"field29,omitempty"`
+	Field30  bool                      `protobuf:"varint,30,opt,name=field30,proto3" json:"field30,omitempty"`
+	Field60  int32                     `protobuf:"varint,60,opt,name=field60,proto3" json:"field60,omitempty"`
+	Field271 int32                     `protobuf:"varint,271,opt,name=field271,proto3" json:"field271,omitempty"`
+	Field272 int32                     `protobuf:"varint,272,opt,name=field272,proto3" json:"field272,omitempty"`
+	Field150 int32                     `protobuf:"varint,150,opt,name=field150,proto3" json:"field150,omitempty"`
+	Field23  int32                     `protobuf:"varint,23,opt,name=field23,proto3" json:"field23,omitempty"`
+	Field24  bool                      `protobuf:"varint,24,opt,name=field24,proto3" json:"field24,omitempty"`
+	Field25  int32                     `protobuf:"varint,25,opt,name=field25,proto3" json:"field25,omitempty"`
+	Field15  *GoogleMessage1SubMessage `protobuf:"bytes,15,opt,name=field15,proto3" json:"field15,omitempty"`
+	Field78  bool                      `protobuf:"varint,78,opt,name=field78,proto3" json:"field78,omitempty"`
+	Field67  int32                     `protobuf:"varint,67,opt,name=field67,proto3" json:"field67,omitempty"`
+	Field68  int32                     `protobuf:"varint,68,opt,name=field68,proto3" json:"field68,omitempty"`
+	Field128 int32                     `protobuf:"varint,128,opt,name=field128,proto3" json:"field128,omitempty"`
+	Field129 string                    `protobuf:"bytes,129,opt,name=field129,proto3" json:"field129,omitempty"`
+	Field131 int32                     `protobuf:"varint,131,opt,name=field131,proto3" json:"field131,omitempty"`
 }
 
 func (x *GoogleMessage1) Reset() {
@@ -382,26 +385,27 @@ type GoogleMessage1SubMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1        int32  `protobuf:"varint,1,opt,name=field1,proto3" json:"field1,omitempty"`
-	Field2        int32  `protobuf:"varint,2,opt,name=field2,proto3" json:"field2,omitempty"`
-	Field3        int32  `protobuf:"varint,3,opt,name=field3,proto3" json:"field3,omitempty"`
-	Field15       string `protobuf:"bytes,15,opt,name=field15,proto3" json:"field15,omitempty"`
-	Field12       bool   `protobuf:"varint,12,opt,name=field12,proto3" json:"field12,omitempty"`
-	Field13       int64  `protobuf:"varint,13,opt,name=field13,proto3" json:"field13,omitempty"`
-	Field14       int64  `protobuf:"varint,14,opt,name=field14,proto3" json:"field14,omitempty"`
-	Field16       int32  `protobuf:"varint,16,opt,name=field16,proto3" json:"field16,omitempty"`
-	Field19       int32  `protobuf:"varint,19,opt,name=field19,proto3" json:"field19,omitempty"`
-	Field20       bool   `protobuf:"varint,20,opt,name=field20,proto3" json:"field20,omitempty"`
-	Field28       bool   `protobuf:"varint,28,opt,name=field28,proto3" json:"field28,omitempty"`
-	Field21       uint64 `protobuf:"fixed64,21,opt,name=field21,proto3" json:"field21,omitempty"`
-	Field22       int32  `protobuf:"varint,22,opt,name=field22,proto3" json:"field22,omitempty"`
-	Field23       bool   `protobuf:"varint,23,opt,name=field23,proto3" json:"field23,omitempty"`
-	Field206      bool   `protobuf:"varint,206,opt,name=field206,proto3" json:"field206,omitempty"`
-	Field203      uint32 `protobuf:"fixed32,203,opt,name=field203,proto3" json:"field203,omitempty"`
-	Field204      int32  `protobuf:"varint,204,opt,name=field204,proto3" json:"field204,omitempty"`
-	Field205      string `protobuf:"bytes,205,opt,name=field205,proto3" json:"field205,omitempty"`
-	Field207      uint64 `protobuf:"varint,207,opt,name=field207,proto3" json:"field207,omitempty"`
-	Field300      uint64 `protobuf:"varint,300,opt,name=field300,proto3" json:"field300,omitempty"`
+
+	Field1   int32  `protobuf:"varint,1,opt,name=field1,proto3" json:"field1,omitempty"`
+	Field2   int32  `protobuf:"varint,2,opt,name=field2,proto3" json:"field2,omitempty"`
+	Field3   int32  `protobuf:"varint,3,opt,name=field3,proto3" json:"field3,omitempty"`
+	Field15  string `protobuf:"bytes,15,opt,name=field15,proto3" json:"field15,omitempty"`
+	Field12  bool   `protobuf:"varint,12,opt,name=field12,proto3" json:"field12,omitempty"`
+	Field13  int64  `protobuf:"varint,13,opt,name=field13,proto3" json:"field13,omitempty"`
+	Field14  int64  `protobuf:"varint,14,opt,name=field14,proto3" json:"field14,omitempty"`
+	Field16  int32  `protobuf:"varint,16,opt,name=field16,proto3" json:"field16,omitempty"`
+	Field19  int32  `protobuf:"varint,19,opt,name=field19,proto3" json:"field19,omitempty"`
+	Field20  bool   `protobuf:"varint,20,opt,name=field20,proto3" json:"field20,omitempty"`
+	Field28  bool   `protobuf:"varint,28,opt,name=field28,proto3" json:"field28,omitempty"`
+	Field21  uint64 `protobuf:"fixed64,21,opt,name=field21,proto3" json:"field21,omitempty"`
+	Field22  int32  `protobuf:"varint,22,opt,name=field22,proto3" json:"field22,omitempty"`
+	Field23  bool   `protobuf:"varint,23,opt,name=field23,proto3" json:"field23,omitempty"`
+	Field206 bool   `protobuf:"varint,206,opt,name=field206,proto3" json:"field206,omitempty"`
+	Field203 uint32 `protobuf:"fixed32,203,opt,name=field203,proto3" json:"field203,omitempty"`
+	Field204 int32  `protobuf:"varint,204,opt,name=field204,proto3" json:"field204,omitempty"`
+	Field205 string `protobuf:"bytes,205,opt,name=field205,proto3" json:"field205,omitempty"`
+	Field207 uint64 `protobuf:"varint,207,opt,name=field207,proto3" json:"field207,omitempty"`
+	Field300 uint64 `protobuf:"varint,300,opt,name=field300,proto3" json:"field300,omitempty"`
 }
 
 func (x *GoogleMessage1SubMessage) Reset() {

internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go

@@ -1,3 +1,5 @@
+// Benchmark messages for proto2.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: datasets/google_message2/benchmark_message2.proto
 
@@ -21,36 +23,37 @@ type GoogleMessage2 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1        *string                  `protobuf:"bytes,1,opt,name=field1" json:"field1,omitempty"`
-	Field3        *int64                   `protobuf:"varint,3,opt,name=field3" json:"field3,omitempty"`
-	Field4        *int64                   `protobuf:"varint,4,opt,name=field4" json:"field4,omitempty"`
-	Field30       *int64                   `protobuf:"varint,30,opt,name=field30" json:"field30,omitempty"`
-	Field75       *bool                    `protobuf:"varint,75,opt,name=field75,def=0" json:"field75,omitempty"`
-	Field6        *string                  `protobuf:"bytes,6,opt,name=field6" json:"field6,omitempty"`
-	Field2        []byte                   `protobuf:"bytes,2,opt,name=field2" json:"field2,omitempty"`
-	Field21       *int32                   `protobuf:"varint,21,opt,name=field21,def=0" json:"field21,omitempty"`
-	Field71       *int32                   `protobuf:"varint,71,opt,name=field71" json:"field71,omitempty"`
-	Field25       *float32                 `protobuf:"fixed32,25,opt,name=field25" json:"field25,omitempty"`
-	Field109      *int32                   `protobuf:"varint,109,opt,name=field109,def=0" json:"field109,omitempty"`
-	Field210      *int32                   `protobuf:"varint,210,opt,name=field210,def=0" json:"field210,omitempty"`
-	Field211      *int32                   `protobuf:"varint,211,opt,name=field211,def=0" json:"field211,omitempty"`
-	Field212      *int32                   `protobuf:"varint,212,opt,name=field212,def=0" json:"field212,omitempty"`
-	Field213      *int32                   `protobuf:"varint,213,opt,name=field213,def=0" json:"field213,omitempty"`
-	Field216      *int32                   `protobuf:"varint,216,opt,name=field216,def=0" json:"field216,omitempty"`
-	Field217      *int32                   `protobuf:"varint,217,opt,name=field217,def=0" json:"field217,omitempty"`
-	Field218      *int32                   `protobuf:"varint,218,opt,name=field218,def=0" json:"field218,omitempty"`
-	Field220      *int32                   `protobuf:"varint,220,opt,name=field220,def=0" json:"field220,omitempty"`
-	Field221      *int32                   `protobuf:"varint,221,opt,name=field221,def=0" json:"field221,omitempty"`
-	Field222      *float32                 `protobuf:"fixed32,222,opt,name=field222,def=0" json:"field222,omitempty"`
-	Field63       *int32                   `protobuf:"varint,63,opt,name=field63" json:"field63,omitempty"`
-	Group1        []*GoogleMessage2_Group1 `protobuf:"group,10,rep,name=Group1,json=group1" json:"group1,omitempty"`
-	Field128      []string                 `protobuf:"bytes,128,rep,name=field128" json:"field128,omitempty"`
-	Field131      *int64                   `protobuf:"varint,131,opt,name=field131" json:"field131,omitempty"`
-	Field127      []string                 `protobuf:"bytes,127,rep,name=field127" json:"field127,omitempty"`
-	Field129      *int32                   `protobuf:"varint,129,opt,name=field129" json:"field129,omitempty"`
-	Field130      []int64                  `protobuf:"varint,130,rep,name=field130" json:"field130,omitempty"`
-	Field205      *bool                    `protobuf:"varint,205,opt,name=field205,def=0" json:"field205,omitempty"`
-	Field206      *bool                    `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
+
+	Field1   *string                  `protobuf:"bytes,1,opt,name=field1" json:"field1,omitempty"`
+	Field3   *int64                   `protobuf:"varint,3,opt,name=field3" json:"field3,omitempty"`
+	Field4   *int64                   `protobuf:"varint,4,opt,name=field4" json:"field4,omitempty"`
+	Field30  *int64                   `protobuf:"varint,30,opt,name=field30" json:"field30,omitempty"`
+	Field75  *bool                    `protobuf:"varint,75,opt,name=field75,def=0" json:"field75,omitempty"`
+	Field6   *string                  `protobuf:"bytes,6,opt,name=field6" json:"field6,omitempty"`
+	Field2   []byte                   `protobuf:"bytes,2,opt,name=field2" json:"field2,omitempty"`
+	Field21  *int32                   `protobuf:"varint,21,opt,name=field21,def=0" json:"field21,omitempty"`
+	Field71  *int32                   `protobuf:"varint,71,opt,name=field71" json:"field71,omitempty"`
+	Field25  *float32                 `protobuf:"fixed32,25,opt,name=field25" json:"field25,omitempty"`
+	Field109 *int32                   `protobuf:"varint,109,opt,name=field109,def=0" json:"field109,omitempty"`
+	Field210 *int32                   `protobuf:"varint,210,opt,name=field210,def=0" json:"field210,omitempty"`
+	Field211 *int32                   `protobuf:"varint,211,opt,name=field211,def=0" json:"field211,omitempty"`
+	Field212 *int32                   `protobuf:"varint,212,opt,name=field212,def=0" json:"field212,omitempty"`
+	Field213 *int32                   `protobuf:"varint,213,opt,name=field213,def=0" json:"field213,omitempty"`
+	Field216 *int32                   `protobuf:"varint,216,opt,name=field216,def=0" json:"field216,omitempty"`
+	Field217 *int32                   `protobuf:"varint,217,opt,name=field217,def=0" json:"field217,omitempty"`
+	Field218 *int32                   `protobuf:"varint,218,opt,name=field218,def=0" json:"field218,omitempty"`
+	Field220 *int32                   `protobuf:"varint,220,opt,name=field220,def=0" json:"field220,omitempty"`
+	Field221 *int32                   `protobuf:"varint,221,opt,name=field221,def=0" json:"field221,omitempty"`
+	Field222 *float32                 `protobuf:"fixed32,222,opt,name=field222,def=0" json:"field222,omitempty"`
+	Field63  *int32                   `protobuf:"varint,63,opt,name=field63" json:"field63,omitempty"`
+	Group1   []*GoogleMessage2_Group1 `protobuf:"group,10,rep,name=Group1,json=group1" json:"group1,omitempty"`
+	Field128 []string                 `protobuf:"bytes,128,rep,name=field128" json:"field128,omitempty"`
+	Field131 *int64                   `protobuf:"varint,131,opt,name=field131" json:"field131,omitempty"`
+	Field127 []string                 `protobuf:"bytes,127,rep,name=field127" json:"field127,omitempty"`
+	Field129 *int32                   `protobuf:"varint,129,opt,name=field129" json:"field129,omitempty"`
+	Field130 []int64                  `protobuf:"varint,130,rep,name=field130" json:"field130,omitempty"`
+	Field205 *bool                    `protobuf:"varint,205,opt,name=field205,def=0" json:"field205,omitempty"`
+	Field206 *bool                    `protobuf:"varint,206,opt,name=field206,def=0" json:"field206,omitempty"`
 }
 
 // Default values for GoogleMessage2 fields.
@@ -313,17 +316,18 @@ type GoogleMessage2GroupedMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1        *float32 `protobuf:"fixed32,1,opt,name=field1" json:"field1,omitempty"`
-	Field2        *float32 `protobuf:"fixed32,2,opt,name=field2" json:"field2,omitempty"`
-	Field3        *float32 `protobuf:"fixed32,3,opt,name=field3,def=0" json:"field3,omitempty"`
-	Field4        *bool    `protobuf:"varint,4,opt,name=field4" json:"field4,omitempty"`
-	Field5        *bool    `protobuf:"varint,5,opt,name=field5" json:"field5,omitempty"`
-	Field6        *bool    `protobuf:"varint,6,opt,name=field6,def=1" json:"field6,omitempty"`
-	Field7        *bool    `protobuf:"varint,7,opt,name=field7,def=0" json:"field7,omitempty"`
-	Field8        *float32 `protobuf:"fixed32,8,opt,name=field8" json:"field8,omitempty"`
-	Field9        *bool    `protobuf:"varint,9,opt,name=field9" json:"field9,omitempty"`
-	Field10       *float32 `protobuf:"fixed32,10,opt,name=field10" json:"field10,omitempty"`
-	Field11       *int64   `protobuf:"varint,11,opt,name=field11" json:"field11,omitempty"`
+
+	Field1  *float32 `protobuf:"fixed32,1,opt,name=field1" json:"field1,omitempty"`
+	Field2  *float32 `protobuf:"fixed32,2,opt,name=field2" json:"field2,omitempty"`
+	Field3  *float32 `protobuf:"fixed32,3,opt,name=field3,def=0" json:"field3,omitempty"`
+	Field4  *bool    `protobuf:"varint,4,opt,name=field4" json:"field4,omitempty"`
+	Field5  *bool    `protobuf:"varint,5,opt,name=field5" json:"field5,omitempty"`
+	Field6  *bool    `protobuf:"varint,6,opt,name=field6,def=1" json:"field6,omitempty"`
+	Field7  *bool    `protobuf:"varint,7,opt,name=field7,def=0" json:"field7,omitempty"`
+	Field8  *float32 `protobuf:"fixed32,8,opt,name=field8" json:"field8,omitempty"`
+	Field9  *bool    `protobuf:"varint,9,opt,name=field9" json:"field9,omitempty"`
+	Field10 *float32 `protobuf:"fixed32,10,opt,name=field10" json:"field10,omitempty"`
+	Field11 *int64   `protobuf:"varint,11,opt,name=field11" json:"field11,omitempty"`
 }
 
 // Default values for GoogleMessage2GroupedMessage fields.
@@ -441,22 +445,23 @@ type GoogleMessage2_Group1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11       *float32                      `protobuf:"fixed32,11,req,name=field11" json:"field11,omitempty"`
-	Field26       *float32                      `protobuf:"fixed32,26,opt,name=field26" json:"field26,omitempty"`
-	Field12       *string                       `protobuf:"bytes,12,opt,name=field12" json:"field12,omitempty"`
-	Field13       *string                       `protobuf:"bytes,13,opt,name=field13" json:"field13,omitempty"`
-	Field14       []string                      `protobuf:"bytes,14,rep,name=field14" json:"field14,omitempty"`
-	Field15       *uint64                       `protobuf:"varint,15,req,name=field15" json:"field15,omitempty"`
-	Field5        *int32                        `protobuf:"varint,5,opt,name=field5" json:"field5,omitempty"`
-	Field27       *string                       `protobuf:"bytes,27,opt,name=field27" json:"field27,omitempty"`
-	Field28       *int32                        `protobuf:"varint,28,opt,name=field28" json:"field28,omitempty"`
-	Field29       *string                       `protobuf:"bytes,29,opt,name=field29" json:"field29,omitempty"`
-	Field16       *string                       `protobuf:"bytes,16,opt,name=field16" json:"field16,omitempty"`
-	Field22       []string                      `protobuf:"bytes,22,rep,name=field22" json:"field22,omitempty"`
-	Field73       []int32                       `protobuf:"varint,73,rep,name=field73" json:"field73,omitempty"`
-	Field20       *int32                        `protobuf:"varint,20,opt,name=field20,def=0" json:"field20,omitempty"`
-	Field24       *string                       `protobuf:"bytes,24,opt,name=field24" json:"field24,omitempty"`
-	Field31       *GoogleMessage2GroupedMessage `protobuf:"bytes,31,opt,name=field31" json:"field31,omitempty"`
+
+	Field11 *float32                      `protobuf:"fixed32,11,req,name=field11" json:"field11,omitempty"`
+	Field26 *float32                      `protobuf:"fixed32,26,opt,name=field26" json:"field26,omitempty"`
+	Field12 *string                       `protobuf:"bytes,12,opt,name=field12" json:"field12,omitempty"`
+	Field13 *string                       `protobuf:"bytes,13,opt,name=field13" json:"field13,omitempty"`
+	Field14 []string                      `protobuf:"bytes,14,rep,name=field14" json:"field14,omitempty"`
+	Field15 *uint64                       `protobuf:"varint,15,req,name=field15" json:"field15,omitempty"`
+	Field5  *int32                        `protobuf:"varint,5,opt,name=field5" json:"field5,omitempty"`
+	Field27 *string                       `protobuf:"bytes,27,opt,name=field27" json:"field27,omitempty"`
+	Field28 *int32                        `protobuf:"varint,28,opt,name=field28" json:"field28,omitempty"`
+	Field29 *string                       `protobuf:"bytes,29,opt,name=field29" json:"field29,omitempty"`
+	Field16 *string                       `protobuf:"bytes,16,opt,name=field16" json:"field16,omitempty"`
+	Field22 []string                      `protobuf:"bytes,22,rep,name=field22" json:"field22,omitempty"`
+	Field73 []int32                       `protobuf:"varint,73,rep,name=field73" json:"field73,omitempty"`
+	Field20 *int32                        `protobuf:"varint,20,opt,name=field20,def=0" json:"field20,omitempty"`
+	Field24 *string                       `protobuf:"bytes,24,opt,name=field24" json:"field24,omitempty"`
+	Field31 *GoogleMessage2GroupedMessage `protobuf:"bytes,31,opt,name=field31" json:"field31,omitempty"`
 }
 
 // Default values for GoogleMessage2_Group1 fields.

internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go

@@ -22,21 +22,22 @@ type GoogleMessage3 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37519    *Message37487       `protobuf:"bytes,2,opt,name=field37519" json:"field37519,omitempty"`
-	Field37520    *Message36876       `protobuf:"bytes,3,opt,name=field37520" json:"field37520,omitempty"`
-	Field37521    *Message13062       `protobuf:"bytes,4,opt,name=field37521" json:"field37521,omitempty"`
-	Field37522    *Message952         `protobuf:"bytes,5,opt,name=field37522" json:"field37522,omitempty"`
-	Field37523    *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field37523" json:"field37523,omitempty"`
-	Field37524    *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37524" json:"field37524,omitempty"`
-	Field37525    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field37525" json:"field37525,omitempty"`
-	Field37526    *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field37526" json:"field37526,omitempty"`
-	Field37527    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field37527" json:"field37527,omitempty"`
-	Field37528    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37528" json:"field37528,omitempty"`
-	Field37529    *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field37529" json:"field37529,omitempty"`
-	Field37530    *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field37530" json:"field37530,omitempty"`
-	Field37531    *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field37531" json:"field37531,omitempty"`
-	Field37532    *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field37532" json:"field37532,omitempty"`
-	Field37533    *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field37533" json:"field37533,omitempty"`
+
+	Field37519 *Message37487       `protobuf:"bytes,2,opt,name=field37519" json:"field37519,omitempty"`
+	Field37520 *Message36876       `protobuf:"bytes,3,opt,name=field37520" json:"field37520,omitempty"`
+	Field37521 *Message13062       `protobuf:"bytes,4,opt,name=field37521" json:"field37521,omitempty"`
+	Field37522 *Message952         `protobuf:"bytes,5,opt,name=field37522" json:"field37522,omitempty"`
+	Field37523 *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field37523" json:"field37523,omitempty"`
+	Field37524 *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37524" json:"field37524,omitempty"`
+	Field37525 *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field37525" json:"field37525,omitempty"`
+	Field37526 *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field37526" json:"field37526,omitempty"`
+	Field37527 *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field37527" json:"field37527,omitempty"`
+	Field37528 *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37528" json:"field37528,omitempty"`
+	Field37529 *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field37529" json:"field37529,omitempty"`
+	Field37530 *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field37530" json:"field37530,omitempty"`
+	Field37531 *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field37531" json:"field37531,omitempty"`
+	Field37532 *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field37532" json:"field37532,omitempty"`
+	Field37533 *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field37533" json:"field37533,omitempty"`
 }
 
 func (x *GoogleMessage3) Reset() {
@@ -175,10 +176,11 @@ type Message1327 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1369     []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field1369" json:"field1369,omitempty"`
-	Field1370     []*Message1328        `protobuf:"bytes,3,rep,name=field1370" json:"field1370,omitempty"`
-	Field1371     []*UnusedEmptyMessage `protobuf:"bytes,5,rep,name=field1371" json:"field1371,omitempty"`
-	Field1372     []*UnusedEmptyMessage `protobuf:"bytes,6,rep,name=field1372" json:"field1372,omitempty"`
+
+	Field1369 []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field1369" json:"field1369,omitempty"`
+	Field1370 []*Message1328        `protobuf:"bytes,3,rep,name=field1370" json:"field1370,omitempty"`
+	Field1371 []*UnusedEmptyMessage `protobuf:"bytes,5,rep,name=field1371" json:"field1371,omitempty"`
+	Field1372 []*UnusedEmptyMessage `protobuf:"bytes,6,rep,name=field1372" json:"field1372,omitempty"`
 }
 
 func (x *Message1327) Reset() {
@@ -240,16 +242,17 @@ type Message3672 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3727     *Enum3476                  `protobuf:"varint,1,opt,name=field3727,enum=benchmarks.google_message3.Enum3476" json:"field3727,omitempty"`
-	Field3728     *int32                     `protobuf:"varint,11,opt,name=field3728" json:"field3728,omitempty"`
-	Field3729     *int32                     `protobuf:"varint,2,opt,name=field3729" json:"field3729,omitempty"`
-	Message3673   []*Message3672_Message3673 `protobuf:"group,3,rep,name=Message3673,json=message3673" json:"message3673,omitempty"`
-	Message3674   []*Message3672_Message3674 `protobuf:"group,6,rep,name=Message3674,json=message3674" json:"message3674,omitempty"`
-	Field3732     *bool                      `protobuf:"varint,9,opt,name=field3732" json:"field3732,omitempty"`
-	Field3733     *int32                     `protobuf:"varint,10,opt,name=field3733" json:"field3733,omitempty"`
-	Field3734     *Enum3476                  `protobuf:"varint,20,opt,name=field3734,enum=benchmarks.google_message3.Enum3476" json:"field3734,omitempty"`
-	Field3735     *int32                     `protobuf:"varint,21,opt,name=field3735" json:"field3735,omitempty"`
-	Field3736     *UnusedEmptyMessage        `protobuf:"bytes,50,opt,name=field3736" json:"field3736,omitempty"`
+
+	Field3727   *Enum3476                  `protobuf:"varint,1,opt,name=field3727,enum=benchmarks.google_message3.Enum3476" json:"field3727,omitempty"`
+	Field3728   *int32                     `protobuf:"varint,11,opt,name=field3728" json:"field3728,omitempty"`
+	Field3729   *int32                     `protobuf:"varint,2,opt,name=field3729" json:"field3729,omitempty"`
+	Message3673 []*Message3672_Message3673 `protobuf:"group,3,rep,name=Message3673,json=message3673" json:"message3673,omitempty"`
+	Message3674 []*Message3672_Message3674 `protobuf:"group,6,rep,name=Message3674,json=message3674" json:"message3674,omitempty"`
+	Field3732   *bool                      `protobuf:"varint,9,opt,name=field3732" json:"field3732,omitempty"`
+	Field3733   *int32                     `protobuf:"varint,10,opt,name=field3733" json:"field3733,omitempty"`
+	Field3734   *Enum3476                  `protobuf:"varint,20,opt,name=field3734,enum=benchmarks.google_message3.Enum3476" json:"field3734,omitempty"`
+	Field3735   *int32                     `protobuf:"varint,21,opt,name=field3735" json:"field3735,omitempty"`
+	Field3736   *UnusedEmptyMessage        `protobuf:"bytes,50,opt,name=field3736" json:"field3736,omitempty"`
 }
 
 func (x *Message3672) Reset() {
@@ -353,13 +356,14 @@ type Message3804 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3818     *int64     `protobuf:"varint,1,req,name=field3818" json:"field3818,omitempty"`
-	Field3819     *bool      `protobuf:"varint,2,req,name=field3819" json:"field3819,omitempty"`
-	Field3820     []Enum3805 `protobuf:"varint,4,rep,name=field3820,enum=benchmarks.google_message3.Enum3805" json:"field3820,omitempty"`
-	Field3821     *int32     `protobuf:"varint,5,opt,name=field3821" json:"field3821,omitempty"`
-	Field3822     *bool      `protobuf:"varint,6,opt,name=field3822" json:"field3822,omitempty"`
-	Field3823     *int64     `protobuf:"varint,7,opt,name=field3823" json:"field3823,omitempty"`
-	Field3824     *Enum3783  `protobuf:"varint,8,opt,name=field3824,enum=benchmarks.google_message3.Enum3783" json:"field3824,omitempty"`
+
+	Field3818 *int64     `protobuf:"varint,1,req,name=field3818" json:"field3818,omitempty"`
+	Field3819 *bool      `protobuf:"varint,2,req,name=field3819" json:"field3819,omitempty"`
+	Field3820 []Enum3805 `protobuf:"varint,4,rep,name=field3820,enum=benchmarks.google_message3.Enum3805" json:"field3820,omitempty"`
+	Field3821 *int32     `protobuf:"varint,5,opt,name=field3821" json:"field3821,omitempty"`
+	Field3822 *bool      `protobuf:"varint,6,opt,name=field3822" json:"field3822,omitempty"`
+	Field3823 *int64     `protobuf:"varint,7,opt,name=field3823" json:"field3823,omitempty"`
+	Field3824 *Enum3783  `protobuf:"varint,8,opt,name=field3824,enum=benchmarks.google_message3.Enum3783" json:"field3824,omitempty"`
 }
 
 func (x *Message3804) Reset() {
@@ -442,7 +446,8 @@ type Message6849 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6910     []*Message6850 `protobuf:"bytes,1,rep,name=field6910" json:"field6910,omitempty"`
+
+	Field6910 []*Message6850 `protobuf:"bytes,1,rep,name=field6910" json:"field6910,omitempty"`
 }
 
 func (x *Message6849) Reset() {
@@ -483,7 +488,8 @@ type Message6866 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6973     []*Message6863 `protobuf:"bytes,1,rep,name=field6973" json:"field6973,omitempty"`
+
+	Field6973 []*Message6863 `protobuf:"bytes,1,rep,name=field6973" json:"field6973,omitempty"`
 }
 
 func (x *Message6866) Reset() {
@@ -524,7 +530,8 @@ type Message6870 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6991     []*Message6871 `protobuf:"bytes,1,rep,name=field6991" json:"field6991,omitempty"`
+
+	Field6991 []*Message6871 `protobuf:"bytes,1,rep,name=field6991" json:"field6991,omitempty"`
 }
 
 func (x *Message6870) Reset() {
@@ -565,51 +572,52 @@ type Message7651 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7685     *string               `protobuf:"bytes,1,opt,name=field7685" json:"field7685,omitempty"`
-	Field7686     *int64                `protobuf:"varint,2,opt,name=field7686" json:"field7686,omitempty"`
-	Field7687     *int64                `protobuf:"varint,3,opt,name=field7687" json:"field7687,omitempty"`
-	Field7688     *int64                `protobuf:"varint,4,opt,name=field7688" json:"field7688,omitempty"`
-	Field7689     *int32                `protobuf:"varint,5,opt,name=field7689" json:"field7689,omitempty"`
-	Field7690     *int32                `protobuf:"varint,6,opt,name=field7690" json:"field7690,omitempty"`
-	Field7691     *int32                `protobuf:"varint,7,opt,name=field7691" json:"field7691,omitempty"`
-	Field7692     *int32                `protobuf:"varint,8,opt,name=field7692" json:"field7692,omitempty"`
-	Field7693     *int32                `protobuf:"varint,9,opt,name=field7693" json:"field7693,omitempty"`
-	Field7694     *int32                `protobuf:"varint,10,opt,name=field7694" json:"field7694,omitempty"`
-	Field7695     *int32                `protobuf:"varint,11,opt,name=field7695" json:"field7695,omitempty"`
-	Field7696     *int32                `protobuf:"varint,12,opt,name=field7696" json:"field7696,omitempty"`
-	Field7697     *int32                `protobuf:"varint,13,opt,name=field7697" json:"field7697,omitempty"`
-	Field7698     *int32                `protobuf:"varint,14,opt,name=field7698" json:"field7698,omitempty"`
-	Field7699     *int32                `protobuf:"varint,15,opt,name=field7699" json:"field7699,omitempty"`
-	Field7700     *int32                `protobuf:"varint,16,opt,name=field7700" json:"field7700,omitempty"`
-	Field7701     *int32                `protobuf:"varint,17,opt,name=field7701" json:"field7701,omitempty"`
-	Field7702     *int32                `protobuf:"varint,18,opt,name=field7702" json:"field7702,omitempty"`
-	Field7703     *bool                 `protobuf:"varint,19,opt,name=field7703" json:"field7703,omitempty"`
-	Field7704     []int32               `protobuf:"varint,20,rep,name=field7704" json:"field7704,omitempty"`
-	Field7705     []int32               `protobuf:"varint,21,rep,name=field7705" json:"field7705,omitempty"`
-	Field7706     []string              `protobuf:"bytes,22,rep,name=field7706" json:"field7706,omitempty"`
-	Field7707     []string              `protobuf:"bytes,23,rep,name=field7707" json:"field7707,omitempty"`
-	Field7708     *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field7708" json:"field7708,omitempty"`
-	Field7709     *int32                `protobuf:"varint,25,opt,name=field7709" json:"field7709,omitempty"`
-	Field7710     *int32                `protobuf:"varint,26,opt,name=field7710" json:"field7710,omitempty"`
-	Field7711     *int32                `protobuf:"varint,27,opt,name=field7711" json:"field7711,omitempty"`
-	Field7712     *int32                `protobuf:"varint,43,opt,name=field7712" json:"field7712,omitempty"`
-	Field7713     *int32                `protobuf:"varint,28,opt,name=field7713" json:"field7713,omitempty"`
-	Field7714     *int32                `protobuf:"varint,29,opt,name=field7714" json:"field7714,omitempty"`
-	Field7715     []*Message7547        `protobuf:"bytes,30,rep,name=field7715" json:"field7715,omitempty"`
-	Field7716     []*Message7547        `protobuf:"bytes,31,rep,name=field7716" json:"field7716,omitempty"`
-	Field7717     []*UnusedEmptyMessage `protobuf:"bytes,32,rep,name=field7717" json:"field7717,omitempty"`
-	Field7718     []string              `protobuf:"bytes,33,rep,name=field7718" json:"field7718,omitempty"`
-	Field7719     []string              `protobuf:"bytes,34,rep,name=field7719" json:"field7719,omitempty"`
-	Field7720     []*Message7648        `protobuf:"bytes,35,rep,name=field7720" json:"field7720,omitempty"`
-	Field7721     *bool                 `protobuf:"varint,36,opt,name=field7721" json:"field7721,omitempty"`
-	Field7722     *bool                 `protobuf:"varint,37,opt,name=field7722" json:"field7722,omitempty"`
-	Field7723     *bool                 `protobuf:"varint,38,opt,name=field7723" json:"field7723,omitempty"`
-	Field7724     *bool                 `protobuf:"varint,39,opt,name=field7724" json:"field7724,omitempty"`
-	Field7725     *UnusedEmptyMessage   `protobuf:"bytes,40,opt,name=field7725" json:"field7725,omitempty"`
-	Field7726     *UnusedEnum           `protobuf:"varint,41,opt,name=field7726,enum=benchmarks.google_message3.UnusedEnum" json:"field7726,omitempty"`
-	Field7727     *Enum7654             `protobuf:"varint,42,opt,name=field7727,enum=benchmarks.google_message3.Enum7654" json:"field7727,omitempty"`
-	Field7728     *string               `protobuf:"bytes,44,opt,name=field7728" json:"field7728,omitempty"`
-	Field7729     *UnusedEmptyMessage   `protobuf:"bytes,45,opt,name=field7729" json:"field7729,omitempty"`
+
+	Field7685 *string               `protobuf:"bytes,1,opt,name=field7685" json:"field7685,omitempty"`
+	Field7686 *int64                `protobuf:"varint,2,opt,name=field7686" json:"field7686,omitempty"`
+	Field7687 *int64                `protobuf:"varint,3,opt,name=field7687" json:"field7687,omitempty"`
+	Field7688 *int64                `protobuf:"varint,4,opt,name=field7688" json:"field7688,omitempty"`
+	Field7689 *int32                `protobuf:"varint,5,opt,name=field7689" json:"field7689,omitempty"`
+	Field7690 *int32                `protobuf:"varint,6,opt,name=field7690" json:"field7690,omitempty"`
+	Field7691 *int32                `protobuf:"varint,7,opt,name=field7691" json:"field7691,omitempty"`
+	Field7692 *int32                `protobuf:"varint,8,opt,name=field7692" json:"field7692,omitempty"`
+	Field7693 *int32                `protobuf:"varint,9,opt,name=field7693" json:"field7693,omitempty"`
+	Field7694 *int32                `protobuf:"varint,10,opt,name=field7694" json:"field7694,omitempty"`
+	Field7695 *int32                `protobuf:"varint,11,opt,name=field7695" json:"field7695,omitempty"`
+	Field7696 *int32                `protobuf:"varint,12,opt,name=field7696" json:"field7696,omitempty"`
+	Field7697 *int32                `protobuf:"varint,13,opt,name=field7697" json:"field7697,omitempty"`
+	Field7698 *int32                `protobuf:"varint,14,opt,name=field7698" json:"field7698,omitempty"`
+	Field7699 *int32                `protobuf:"varint,15,opt,name=field7699" json:"field7699,omitempty"`
+	Field7700 *int32                `protobuf:"varint,16,opt,name=field7700" json:"field7700,omitempty"`
+	Field7701 *int32                `protobuf:"varint,17,opt,name=field7701" json:"field7701,omitempty"`
+	Field7702 *int32                `protobuf:"varint,18,opt,name=field7702" json:"field7702,omitempty"`
+	Field7703 *bool                 `protobuf:"varint,19,opt,name=field7703" json:"field7703,omitempty"`
+	Field7704 []int32               `protobuf:"varint,20,rep,name=field7704" json:"field7704,omitempty"`
+	Field7705 []int32               `protobuf:"varint,21,rep,name=field7705" json:"field7705,omitempty"`
+	Field7706 []string              `protobuf:"bytes,22,rep,name=field7706" json:"field7706,omitempty"`
+	Field7707 []string              `protobuf:"bytes,23,rep,name=field7707" json:"field7707,omitempty"`
+	Field7708 *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field7708" json:"field7708,omitempty"`
+	Field7709 *int32                `protobuf:"varint,25,opt,name=field7709" json:"field7709,omitempty"`
+	Field7710 *int32                `protobuf:"varint,26,opt,name=field7710" json:"field7710,omitempty"`
+	Field7711 *int32                `protobuf:"varint,27,opt,name=field7711" json:"field7711,omitempty"`
+	Field7712 *int32                `protobuf:"varint,43,opt,name=field7712" json:"field7712,omitempty"`
+	Field7713 *int32                `protobuf:"varint,28,opt,name=field7713" json:"field7713,omitempty"`
+	Field7714 *int32                `protobuf:"varint,29,opt,name=field7714" json:"field7714,omitempty"`
+	Field7715 []*Message7547        `protobuf:"bytes,30,rep,name=field7715" json:"field7715,omitempty"`
+	Field7716 []*Message7547        `protobuf:"bytes,31,rep,name=field7716" json:"field7716,omitempty"`
+	Field7717 []*UnusedEmptyMessage `protobuf:"bytes,32,rep,name=field7717" json:"field7717,omitempty"`
+	Field7718 []string              `protobuf:"bytes,33,rep,name=field7718" json:"field7718,omitempty"`
+	Field7719 []string              `protobuf:"bytes,34,rep,name=field7719" json:"field7719,omitempty"`
+	Field7720 []*Message7648        `protobuf:"bytes,35,rep,name=field7720" json:"field7720,omitempty"`
+	Field7721 *bool                 `protobuf:"varint,36,opt,name=field7721" json:"field7721,omitempty"`
+	Field7722 *bool                 `protobuf:"varint,37,opt,name=field7722" json:"field7722,omitempty"`
+	Field7723 *bool                 `protobuf:"varint,38,opt,name=field7723" json:"field7723,omitempty"`
+	Field7724 *bool                 `protobuf:"varint,39,opt,name=field7724" json:"field7724,omitempty"`
+	Field7725 *UnusedEmptyMessage   `protobuf:"bytes,40,opt,name=field7725" json:"field7725,omitempty"`
+	Field7726 *UnusedEnum           `protobuf:"varint,41,opt,name=field7726,enum=benchmarks.google_message3.UnusedEnum" json:"field7726,omitempty"`
+	Field7727 *Enum7654             `protobuf:"varint,42,opt,name=field7727,enum=benchmarks.google_message3.Enum7654" json:"field7727,omitempty"`
+	Field7728 *string               `protobuf:"bytes,44,opt,name=field7728" json:"field7728,omitempty"`
+	Field7729 *UnusedEmptyMessage   `protobuf:"bytes,45,opt,name=field7729" json:"field7729,omitempty"`
 }
 
 func (x *Message7651) Reset() {
@@ -958,12 +966,13 @@ type Message7864 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7866     *string               `protobuf:"bytes,1,opt,name=field7866" json:"field7866,omitempty"`
-	Field7867     *string               `protobuf:"bytes,2,opt,name=field7867" json:"field7867,omitempty"`
-	Field7868     []*Message7865        `protobuf:"bytes,5,rep,name=field7868" json:"field7868,omitempty"`
-	Field7869     []*Message7865        `protobuf:"bytes,6,rep,name=field7869" json:"field7869,omitempty"`
-	Field7870     []*Message7865        `protobuf:"bytes,7,rep,name=field7870" json:"field7870,omitempty"`
-	Field7871     []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field7871" json:"field7871,omitempty"`
+
+	Field7866 *string               `protobuf:"bytes,1,opt,name=field7866" json:"field7866,omitempty"`
+	Field7867 *string               `protobuf:"bytes,2,opt,name=field7867" json:"field7867,omitempty"`
+	Field7868 []*Message7865        `protobuf:"bytes,5,rep,name=field7868" json:"field7868,omitempty"`
+	Field7869 []*Message7865        `protobuf:"bytes,6,rep,name=field7869" json:"field7869,omitempty"`
+	Field7870 []*Message7865        `protobuf:"bytes,7,rep,name=field7870" json:"field7870,omitempty"`
+	Field7871 []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field7871" json:"field7871,omitempty"`
 }
 
 func (x *Message7864) Reset() {
@@ -1039,26 +1048,27 @@ type Message7929 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7942     *int64                `protobuf:"varint,1,opt,name=field7942" json:"field7942,omitempty"`
-	Field7943     *int64                `protobuf:"varint,4,opt,name=field7943" json:"field7943,omitempty"`
-	Field7944     *int64                `protobuf:"varint,5,opt,name=field7944" json:"field7944,omitempty"`
-	Field7945     *int64                `protobuf:"varint,12,opt,name=field7945" json:"field7945,omitempty"`
-	Field7946     *int64                `protobuf:"varint,13,opt,name=field7946" json:"field7946,omitempty"`
-	Field7947     *int64                `protobuf:"varint,18,opt,name=field7947" json:"field7947,omitempty"`
-	Field7948     *int64                `protobuf:"varint,6,opt,name=field7948" json:"field7948,omitempty"`
-	Field7949     *int64                `protobuf:"varint,7,opt,name=field7949" json:"field7949,omitempty"`
-	Field7950     []*Message7919        `protobuf:"bytes,8,rep,name=field7950" json:"field7950,omitempty"`
-	Field7951     []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field7951" json:"field7951,omitempty"`
-	Field7952     []*Message7920        `protobuf:"bytes,14,rep,name=field7952" json:"field7952,omitempty"`
-	Field7953     []*Message7921        `protobuf:"bytes,15,rep,name=field7953" json:"field7953,omitempty"`
-	Field7954     []*Message7928        `protobuf:"bytes,17,rep,name=field7954" json:"field7954,omitempty"`
-	Field7955     *int64                `protobuf:"varint,19,opt,name=field7955" json:"field7955,omitempty"`
-	Field7956     *bool                 `protobuf:"varint,2,opt,name=field7956" json:"field7956,omitempty"`
-	Field7957     *int64                `protobuf:"varint,3,opt,name=field7957" json:"field7957,omitempty"`
-	Field7958     *int64                `protobuf:"varint,9,opt,name=field7958" json:"field7958,omitempty"`
-	Field7959     []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field7959" json:"field7959,omitempty"`
-	Field7960     [][]byte              `protobuf:"bytes,11,rep,name=field7960" json:"field7960,omitempty"`
-	Field7961     *int64                `protobuf:"varint,16,opt,name=field7961" json:"field7961,omitempty"`
+
+	Field7942 *int64                `protobuf:"varint,1,opt,name=field7942" json:"field7942,omitempty"`
+	Field7943 *int64                `protobuf:"varint,4,opt,name=field7943" json:"field7943,omitempty"`
+	Field7944 *int64                `protobuf:"varint,5,opt,name=field7944" json:"field7944,omitempty"`
+	Field7945 *int64                `protobuf:"varint,12,opt,name=field7945" json:"field7945,omitempty"`
+	Field7946 *int64                `protobuf:"varint,13,opt,name=field7946" json:"field7946,omitempty"`
+	Field7947 *int64                `protobuf:"varint,18,opt,name=field7947" json:"field7947,omitempty"`
+	Field7948 *int64                `protobuf:"varint,6,opt,name=field7948" json:"field7948,omitempty"`
+	Field7949 *int64                `protobuf:"varint,7,opt,name=field7949" json:"field7949,omitempty"`
+	Field7950 []*Message7919        `protobuf:"bytes,8,rep,name=field7950" json:"field7950,omitempty"`
+	Field7951 []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field7951" json:"field7951,omitempty"`
+	Field7952 []*Message7920        `protobuf:"bytes,14,rep,name=field7952" json:"field7952,omitempty"`
+	Field7953 []*Message7921        `protobuf:"bytes,15,rep,name=field7953" json:"field7953,omitempty"`
+	Field7954 []*Message7928        `protobuf:"bytes,17,rep,name=field7954" json:"field7954,omitempty"`
+	Field7955 *int64                `protobuf:"varint,19,opt,name=field7955" json:"field7955,omitempty"`
+	Field7956 *bool                 `protobuf:"varint,2,opt,name=field7956" json:"field7956,omitempty"`
+	Field7957 *int64                `protobuf:"varint,3,opt,name=field7957" json:"field7957,omitempty"`
+	Field7958 *int64                `protobuf:"varint,9,opt,name=field7958" json:"field7958,omitempty"`
+	Field7959 []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field7959" json:"field7959,omitempty"`
+	Field7960 [][]byte              `protobuf:"bytes,11,rep,name=field7960" json:"field7960,omitempty"`
+	Field7961 *int64                `protobuf:"varint,16,opt,name=field7961" json:"field7961,omitempty"`
 }
 
 func (x *Message7929) Reset() {
@@ -1232,23 +1242,24 @@ type Message8508 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8517     []*Message8511        `protobuf:"bytes,8,rep,name=field8517" json:"field8517,omitempty"`
-	Field8518     []*Message8512        `protobuf:"bytes,9,rep,name=field8518" json:"field8518,omitempty"`
-	Field8519     []*Message8513        `protobuf:"bytes,11,rep,name=field8519" json:"field8519,omitempty"`
-	Field8520     *bool                 `protobuf:"varint,13,opt,name=field8520" json:"field8520,omitempty"`
-	Field8521     *Message8514          `protobuf:"bytes,14,opt,name=field8521" json:"field8521,omitempty"`
-	Field8522     []*UnusedEmptyMessage `protobuf:"bytes,15,rep,name=field8522" json:"field8522,omitempty"`
-	Field8523     []*Message8515        `protobuf:"bytes,16,rep,name=field8523" json:"field8523,omitempty"`
-	Field8524     []*UnusedEmptyMessage `protobuf:"bytes,17,rep,name=field8524" json:"field8524,omitempty"`
-	Field8525     *int64                `protobuf:"varint,1,opt,name=field8525" json:"field8525,omitempty"`
-	Field8526     *float32              `protobuf:"fixed32,2,opt,name=field8526" json:"field8526,omitempty"`
-	Field8527     *int64                `protobuf:"varint,3,opt,name=field8527" json:"field8527,omitempty"`
-	Field8528     *int64                `protobuf:"varint,4,opt,name=field8528" json:"field8528,omitempty"`
-	Field8529     *int32                `protobuf:"varint,5,opt,name=field8529" json:"field8529,omitempty"`
-	Field8530     []byte                `protobuf:"bytes,6,opt,name=field8530" json:"field8530,omitempty"`
-	Field8531     [][]byte              `protobuf:"bytes,7,rep,name=field8531" json:"field8531,omitempty"`
-	Field8532     *bool                 `protobuf:"varint,10,opt,name=field8532" json:"field8532,omitempty"`
-	Field8533     []byte                `protobuf:"bytes,12,opt,name=field8533" json:"field8533,omitempty"`
+
+	Field8517 []*Message8511        `protobuf:"bytes,8,rep,name=field8517" json:"field8517,omitempty"`
+	Field8518 []*Message8512        `protobuf:"bytes,9,rep,name=field8518" json:"field8518,omitempty"`
+	Field8519 []*Message8513        `protobuf:"bytes,11,rep,name=field8519" json:"field8519,omitempty"`
+	Field8520 *bool                 `protobuf:"varint,13,opt,name=field8520" json:"field8520,omitempty"`
+	Field8521 *Message8514          `protobuf:"bytes,14,opt,name=field8521" json:"field8521,omitempty"`
+	Field8522 []*UnusedEmptyMessage `protobuf:"bytes,15,rep,name=field8522" json:"field8522,omitempty"`
+	Field8523 []*Message8515        `protobuf:"bytes,16,rep,name=field8523" json:"field8523,omitempty"`
+	Field8524 []*UnusedEmptyMessage `protobuf:"bytes,17,rep,name=field8524" json:"field8524,omitempty"`
+	Field8525 *int64                `protobuf:"varint,1,opt,name=field8525" json:"field8525,omitempty"`
+	Field8526 *float32              `protobuf:"fixed32,2,opt,name=field8526" json:"field8526,omitempty"`
+	Field8527 *int64                `protobuf:"varint,3,opt,name=field8527" json:"field8527,omitempty"`
+	Field8528 *int64                `protobuf:"varint,4,opt,name=field8528" json:"field8528,omitempty"`
+	Field8529 *int32                `protobuf:"varint,5,opt,name=field8529" json:"field8529,omitempty"`
+	Field8530 []byte                `protobuf:"bytes,6,opt,name=field8530" json:"field8530,omitempty"`
+	Field8531 [][]byte              `protobuf:"bytes,7,rep,name=field8531" json:"field8531,omitempty"`
+	Field8532 *bool                 `protobuf:"varint,10,opt,name=field8532" json:"field8532,omitempty"`
+	Field8533 []byte                `protobuf:"bytes,12,opt,name=field8533" json:"field8533,omitempty"`
 }
 
 func (x *Message8508) Reset() {
@@ -1401,8 +1412,9 @@ type Message9122 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9132     *float32 `protobuf:"fixed32,1,opt,name=field9132" json:"field9132,omitempty"`
-	Field9133     *float32 `protobuf:"fixed32,2,opt,name=field9133" json:"field9133,omitempty"`
+
+	Field9132 *float32 `protobuf:"fixed32,1,opt,name=field9132" json:"field9132,omitempty"`
+	Field9133 *float32 `protobuf:"fixed32,2,opt,name=field9133" json:"field9133,omitempty"`
 }
 
 func (x *Message9122) Reset() {
@@ -1450,7 +1462,8 @@ type Message10177 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10270    []*Message10155 `protobuf:"bytes,1,rep,name=field10270" json:"field10270,omitempty"`
+
+	Field10270 []*Message10155 `protobuf:"bytes,1,rep,name=field10270" json:"field10270,omitempty"`
 }
 
 func (x *Message10177) Reset() {
@@ -1491,9 +1504,10 @@ type Message10278 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10286    []int32 `protobuf:"varint,1,rep,packed,name=field10286" json:"field10286,omitempty"`
-	Field10287    []int32 `protobuf:"varint,2,rep,packed,name=field10287" json:"field10287,omitempty"`
-	Field10288    *int32  `protobuf:"varint,3,opt,name=field10288" json:"field10288,omitempty"`
+
+	Field10286 []int32 `protobuf:"varint,1,rep,packed,name=field10286" json:"field10286,omitempty"`
+	Field10287 []int32 `protobuf:"varint,2,rep,packed,name=field10287" json:"field10287,omitempty"`
+	Field10288 *int32  `protobuf:"varint,3,opt,name=field10288" json:"field10288,omitempty"`
 }
 
 func (x *Message10278) Reset() {
@@ -1548,7 +1562,8 @@ type Message10323 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10360    []*Message10320 `protobuf:"bytes,1,rep,name=field10360" json:"field10360,omitempty"`
+
+	Field10360 []*Message10320 `protobuf:"bytes,1,rep,name=field10360" json:"field10360,omitempty"`
 }
 
 func (x *Message10323) Reset() {
@@ -1589,8 +1604,9 @@ type Message10324 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10362    []*Message10322 `protobuf:"bytes,1,rep,name=field10362" json:"field10362,omitempty"`
-	Field10363    *Message10321   `protobuf:"bytes,2,opt,name=field10363" json:"field10363,omitempty"`
+
+	Field10362 []*Message10322 `protobuf:"bytes,1,rep,name=field10362" json:"field10362,omitempty"`
+	Field10363 *Message10321   `protobuf:"bytes,2,opt,name=field10363" json:"field10363,omitempty"`
 }
 
 func (x *Message10324) Reset() {
@@ -1638,7 +1654,8 @@ type Message11990 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12030    []*Message11988 `protobuf:"bytes,1,rep,name=field12030" json:"field12030,omitempty"`
+
+	Field12030 []*Message11988 `protobuf:"bytes,1,rep,name=field12030" json:"field12030,omitempty"`
 }
 
 func (x *Message11990) Reset() {
@@ -1679,9 +1696,10 @@ type Message12691 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12713    *string       `protobuf:"bytes,1,opt,name=field12713" json:"field12713,omitempty"`
-	Field12714    *int32        `protobuf:"varint,2,opt,name=field12714" json:"field12714,omitempty"`
-	Field12715    *Message12668 `protobuf:"bytes,3,opt,name=field12715" json:"field12715,omitempty"`
+
+	Field12713 *string       `protobuf:"bytes,1,opt,name=field12713" json:"field12713,omitempty"`
+	Field12714 *int32        `protobuf:"varint,2,opt,name=field12714" json:"field12714,omitempty"`
+	Field12715 *Message12668 `protobuf:"bytes,3,opt,name=field12715" json:"field12715,omitempty"`
 }
 
 func (x *Message12691) Reset() {
@@ -1736,26 +1754,27 @@ type Message12870 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12879    *int32          `protobuf:"varint,1,req,name=field12879" json:"field12879,omitempty"`
-	Field12880    *int32          `protobuf:"varint,7,opt,name=field12880" json:"field12880,omitempty"`
-	Field12881    *int32          `protobuf:"varint,2,req,name=field12881" json:"field12881,omitempty"`
-	Field12882    *uint64         `protobuf:"varint,3,opt,name=field12882" json:"field12882,omitempty"`
-	Field12883    *string         `protobuf:"bytes,2001,opt,name=field12883" json:"field12883,omitempty"`
-	Field12884    *uint64         `protobuf:"fixed64,4,opt,name=field12884" json:"field12884,omitempty"`
-	Field12885    []uint64        `protobuf:"fixed64,14,rep,name=field12885" json:"field12885,omitempty"`
-	Field12886    *int32          `protobuf:"varint,9,opt,name=field12886" json:"field12886,omitempty"`
-	Field12887    *int64          `protobuf:"varint,18,opt,name=field12887" json:"field12887,omitempty"`
-	Field12888    []*Message12870 `protobuf:"bytes,8,rep,name=field12888" json:"field12888,omitempty"`
-	Field12889    *int32          `protobuf:"varint,5,opt,name=field12889" json:"field12889,omitempty"`
-	Field12890    *uint64         `protobuf:"varint,6,opt,name=field12890" json:"field12890,omitempty"`
-	Field12891    *int32          `protobuf:"varint,10,opt,name=field12891" json:"field12891,omitempty"`
-	Field12892    *int32          `protobuf:"varint,11,opt,name=field12892" json:"field12892,omitempty"`
-	Field12893    *float64        `protobuf:"fixed64,12,opt,name=field12893" json:"field12893,omitempty"`
-	Field12894    *Message12825   `protobuf:"bytes,13,opt,name=field12894" json:"field12894,omitempty"`
-	Field12895    *float64        `protobuf:"fixed64,15,opt,name=field12895" json:"field12895,omitempty"`
-	Field12896    *string         `protobuf:"bytes,16,opt,name=field12896" json:"field12896,omitempty"`
-	Field12897    *Enum12871      `protobuf:"varint,17,opt,name=field12897,enum=benchmarks.google_message3.Enum12871" json:"field12897,omitempty"`
-	Field12898    *int32          `protobuf:"varint,19,opt,name=field12898" json:"field12898,omitempty"`
+
+	Field12879 *int32          `protobuf:"varint,1,req,name=field12879" json:"field12879,omitempty"`
+	Field12880 *int32          `protobuf:"varint,7,opt,name=field12880" json:"field12880,omitempty"`
+	Field12881 *int32          `protobuf:"varint,2,req,name=field12881" json:"field12881,omitempty"`
+	Field12882 *uint64         `protobuf:"varint,3,opt,name=field12882" json:"field12882,omitempty"`
+	Field12883 *string         `protobuf:"bytes,2001,opt,name=field12883" json:"field12883,omitempty"`
+	Field12884 *uint64         `protobuf:"fixed64,4,opt,name=field12884" json:"field12884,omitempty"`
+	Field12885 []uint64        `protobuf:"fixed64,14,rep,name=field12885" json:"field12885,omitempty"`
+	Field12886 *int32          `protobuf:"varint,9,opt,name=field12886" json:"field12886,omitempty"`
+	Field12887 *int64          `protobuf:"varint,18,opt,name=field12887" json:"field12887,omitempty"`
+	Field12888 []*Message12870 `protobuf:"bytes,8,rep,name=field12888" json:"field12888,omitempty"`
+	Field12889 *int32          `protobuf:"varint,5,opt,name=field12889" json:"field12889,omitempty"`
+	Field12890 *uint64         `protobuf:"varint,6,opt,name=field12890" json:"field12890,omitempty"`
+	Field12891 *int32          `protobuf:"varint,10,opt,name=field12891" json:"field12891,omitempty"`
+	Field12892 *int32          `protobuf:"varint,11,opt,name=field12892" json:"field12892,omitempty"`
+	Field12893 *float64        `protobuf:"fixed64,12,opt,name=field12893" json:"field12893,omitempty"`
+	Field12894 *Message12825   `protobuf:"bytes,13,opt,name=field12894" json:"field12894,omitempty"`
+	Field12895 *float64        `protobuf:"fixed64,15,opt,name=field12895" json:"field12895,omitempty"`
+	Field12896 *string         `protobuf:"bytes,16,opt,name=field12896" json:"field12896,omitempty"`
+	Field12897 *Enum12871      `protobuf:"varint,17,opt,name=field12897,enum=benchmarks.google_message3.Enum12871" json:"field12897,omitempty"`
+	Field12898 *int32          `protobuf:"varint,19,opt,name=field12898" json:"field12898,omitempty"`
 }
 
 func (x *Message12870) Reset() {
@@ -1929,8 +1948,9 @@ type Message13154 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13164    *float32 `protobuf:"fixed32,1,req,name=field13164" json:"field13164,omitempty"`
-	Field13165    *float32 `protobuf:"fixed32,2,req,name=field13165" json:"field13165,omitempty"`
+
+	Field13164 *float32 `protobuf:"fixed32,1,req,name=field13164" json:"field13164,omitempty"`
+	Field13165 *float32 `protobuf:"fixed32,2,req,name=field13165" json:"field13165,omitempty"`
 }
 
 func (x *Message13154) Reset() {
@@ -1979,38 +1999,39 @@ type Message16507 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field16510      *bool                 `protobuf:"varint,3,opt,name=field16510" json:"field16510,omitempty"`
-	Field16511      *bool                 `protobuf:"varint,4,opt,name=field16511" json:"field16511,omitempty"`
-	Field16512      *bool                 `protobuf:"varint,14,opt,name=field16512" json:"field16512,omitempty"`
-	Field16513      []string              `protobuf:"bytes,5,rep,name=field16513" json:"field16513,omitempty"`
-	Field16514      []string              `protobuf:"bytes,6,rep,name=field16514" json:"field16514,omitempty"`
-	Field16515      *string               `protobuf:"bytes,8,opt,name=field16515" json:"field16515,omitempty"`
-	Field16516      []int32               `protobuf:"varint,9,rep,name=field16516" json:"field16516,omitempty"`
-	Field16517      []int32               `protobuf:"varint,10,rep,name=field16517" json:"field16517,omitempty"`
-	Field16518      *int32                `protobuf:"varint,7,opt,name=field16518" json:"field16518,omitempty"`
-	Field16519      *string               `protobuf:"bytes,15,opt,name=field16519" json:"field16519,omitempty"`
-	Field16520      []string              `protobuf:"bytes,11,rep,name=field16520" json:"field16520,omitempty"`
-	Field16521      []*UnusedEmptyMessage `protobuf:"bytes,27,rep,name=field16521" json:"field16521,omitempty"`
-	Field16522      []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field16522" json:"field16522,omitempty"`
-	Field16523      []*UnusedEmptyMessage `protobuf:"bytes,28,rep,name=field16523" json:"field16523,omitempty"`
-	Field16524      *string               `protobuf:"bytes,18,opt,name=field16524" json:"field16524,omitempty"`
-	Field16525      *int32                `protobuf:"varint,19,opt,name=field16525" json:"field16525,omitempty"`
-	Field16526      *int32                `protobuf:"varint,20,opt,name=field16526" json:"field16526,omitempty"`
-	Field16527      *UnusedEmptyMessage   `protobuf:"bytes,23,opt,name=field16527" json:"field16527,omitempty"`
-	Field16528      *bool                 `protobuf:"varint,24,opt,name=field16528" json:"field16528,omitempty"`
-	Field16529      []string              `protobuf:"bytes,25,rep,name=field16529" json:"field16529,omitempty"`
-	Field16530      *float64              `protobuf:"fixed64,26,opt,name=field16530" json:"field16530,omitempty"`
-	Field16531      *Message16478         `protobuf:"bytes,30,opt,name=field16531" json:"field16531,omitempty"`
-	Field16532      *bool                 `protobuf:"varint,31,opt,name=field16532" json:"field16532,omitempty"`
-	Field16533      *string               `protobuf:"bytes,32,opt,name=field16533" json:"field16533,omitempty"`
-	Field16534      *bool                 `protobuf:"varint,33,opt,name=field16534" json:"field16534,omitempty"`
-	Field16535      *bool                 `protobuf:"varint,35,opt,name=field16535" json:"field16535,omitempty"`
-	Field16536      *bool                 `protobuf:"varint,36,opt,name=field16536" json:"field16536,omitempty"`
-	Field16537      *bool                 `protobuf:"varint,37,opt,name=field16537" json:"field16537,omitempty"`
-	Field16538      *bool                 `protobuf:"varint,38,opt,name=field16538" json:"field16538,omitempty"`
-	Field16539      *bool                 `protobuf:"varint,39,opt,name=field16539" json:"field16539,omitempty"`
-	Field16540      *bool                 `protobuf:"varint,40,opt,name=field16540" json:"field16540,omitempty"`
-	Field16541      []string              `protobuf:"bytes,41,rep,name=field16541" json:"field16541,omitempty"`
+
+	Field16510 *bool                 `protobuf:"varint,3,opt,name=field16510" json:"field16510,omitempty"`
+	Field16511 *bool                 `protobuf:"varint,4,opt,name=field16511" json:"field16511,omitempty"`
+	Field16512 *bool                 `protobuf:"varint,14,opt,name=field16512" json:"field16512,omitempty"`
+	Field16513 []string              `protobuf:"bytes,5,rep,name=field16513" json:"field16513,omitempty"`
+	Field16514 []string              `protobuf:"bytes,6,rep,name=field16514" json:"field16514,omitempty"`
+	Field16515 *string               `protobuf:"bytes,8,opt,name=field16515" json:"field16515,omitempty"`
+	Field16516 []int32               `protobuf:"varint,9,rep,name=field16516" json:"field16516,omitempty"`
+	Field16517 []int32               `protobuf:"varint,10,rep,name=field16517" json:"field16517,omitempty"`
+	Field16518 *int32                `protobuf:"varint,7,opt,name=field16518" json:"field16518,omitempty"`
+	Field16519 *string               `protobuf:"bytes,15,opt,name=field16519" json:"field16519,omitempty"`
+	Field16520 []string              `protobuf:"bytes,11,rep,name=field16520" json:"field16520,omitempty"`
+	Field16521 []*UnusedEmptyMessage `protobuf:"bytes,27,rep,name=field16521" json:"field16521,omitempty"`
+	Field16522 []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field16522" json:"field16522,omitempty"`
+	Field16523 []*UnusedEmptyMessage `protobuf:"bytes,28,rep,name=field16523" json:"field16523,omitempty"`
+	Field16524 *string               `protobuf:"bytes,18,opt,name=field16524" json:"field16524,omitempty"`
+	Field16525 *int32                `protobuf:"varint,19,opt,name=field16525" json:"field16525,omitempty"`
+	Field16526 *int32                `protobuf:"varint,20,opt,name=field16526" json:"field16526,omitempty"`
+	Field16527 *UnusedEmptyMessage   `protobuf:"bytes,23,opt,name=field16527" json:"field16527,omitempty"`
+	Field16528 *bool                 `protobuf:"varint,24,opt,name=field16528" json:"field16528,omitempty"`
+	Field16529 []string              `protobuf:"bytes,25,rep,name=field16529" json:"field16529,omitempty"`
+	Field16530 *float64              `protobuf:"fixed64,26,opt,name=field16530" json:"field16530,omitempty"`
+	Field16531 *Message16478         `protobuf:"bytes,30,opt,name=field16531" json:"field16531,omitempty"`
+	Field16532 *bool                 `protobuf:"varint,31,opt,name=field16532" json:"field16532,omitempty"`
+	Field16533 *string               `protobuf:"bytes,32,opt,name=field16533" json:"field16533,omitempty"`
+	Field16534 *bool                 `protobuf:"varint,33,opt,name=field16534" json:"field16534,omitempty"`
+	Field16535 *bool                 `protobuf:"varint,35,opt,name=field16535" json:"field16535,omitempty"`
+	Field16536 *bool                 `protobuf:"varint,36,opt,name=field16536" json:"field16536,omitempty"`
+	Field16537 *bool                 `protobuf:"varint,37,opt,name=field16537" json:"field16537,omitempty"`
+	Field16538 *bool                 `protobuf:"varint,38,opt,name=field16538" json:"field16538,omitempty"`
+	Field16539 *bool                 `protobuf:"varint,39,opt,name=field16539" json:"field16539,omitempty"`
+	Field16540 *bool                 `protobuf:"varint,40,opt,name=field16540" json:"field16540,omitempty"`
+	Field16541 []string              `protobuf:"bytes,41,rep,name=field16541" json:"field16541,omitempty"`
 }
 
 func (x *Message16507) Reset() {
@@ -2277,7 +2298,8 @@ type Message16564 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16568    []*Message16552 `protobuf:"bytes,1,rep,name=field16568" json:"field16568,omitempty"`
+
+	Field16568 []*Message16552 `protobuf:"bytes,1,rep,name=field16568" json:"field16568,omitempty"`
 }
 
 func (x *Message16564) Reset() {
@@ -2318,8 +2340,9 @@ type Message16661 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16671    []*Message16660 `protobuf:"bytes,1,rep,name=field16671" json:"field16671,omitempty"`
-	Field16672    []uint64        `protobuf:"varint,2,rep,name=field16672" json:"field16672,omitempty"`
+
+	Field16671 []*Message16660 `protobuf:"bytes,1,rep,name=field16671" json:"field16671,omitempty"`
+	Field16672 []uint64        `protobuf:"varint,2,rep,name=field16672" json:"field16672,omitempty"`
 }
 
 func (x *Message16661) Reset() {
@@ -2367,10 +2390,11 @@ type Message16746 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16806    []*Message16727 `protobuf:"bytes,1,rep,name=field16806" json:"field16806,omitempty"`
-	Field16807    *bool           `protobuf:"varint,2,opt,name=field16807" json:"field16807,omitempty"`
-	Field16808    *bool           `protobuf:"varint,3,opt,name=field16808" json:"field16808,omitempty"`
-	Field16809    []*Message16725 `protobuf:"bytes,4,rep,name=field16809" json:"field16809,omitempty"`
+
+	Field16806 []*Message16727 `protobuf:"bytes,1,rep,name=field16806" json:"field16806,omitempty"`
+	Field16807 *bool           `protobuf:"varint,2,opt,name=field16807" json:"field16807,omitempty"`
+	Field16808 *bool           `protobuf:"varint,3,opt,name=field16808" json:"field16808,omitempty"`
+	Field16809 []*Message16725 `protobuf:"bytes,4,rep,name=field16809" json:"field16809,omitempty"`
 }
 
 func (x *Message16746) Reset() {
@@ -2432,8 +2456,9 @@ type Message17786 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Message17787  []*Message17786_Message17787 `protobuf:"group,1,rep,name=Message17787,json=message17787" json:"message17787,omitempty"`
-	Field18175    []*Message17782              `protobuf:"bytes,20,rep,name=field18175" json:"field18175,omitempty"`
+
+	Message17787 []*Message17786_Message17787 `protobuf:"group,1,rep,name=Message17787,json=message17787" json:"message17787,omitempty"`
+	Field18175   []*Message17782              `protobuf:"bytes,20,rep,name=field18175" json:"field18175,omitempty"`
 }
 
 func (x *Message17786) Reset() {
@@ -2481,7 +2506,8 @@ type Message22857 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field22874    []*Message22853 `protobuf:"bytes,1,rep,name=field22874" json:"field22874,omitempty"`
+
+	Field22874 []*Message22853 `protobuf:"bytes,1,rep,name=field22874" json:"field22874,omitempty"`
 }
 
 func (x *Message22857) Reset() {
@@ -2522,8 +2548,9 @@ type Message24404 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Message24405  []*Message24404_Message24405 `protobuf:"group,1,rep,name=Message24405,json=message24405" json:"message24405,omitempty"`
-	Field24684    *Message24403                `protobuf:"bytes,30,opt,name=field24684" json:"field24684,omitempty"`
+
+	Message24405 []*Message24404_Message24405 `protobuf:"group,1,rep,name=Message24405,json=message24405" json:"message24405,omitempty"`
+	Field24684   *Message24403                `protobuf:"bytes,30,opt,name=field24684" json:"field24684,omitempty"`
 }
 
 func (x *Message24404) Reset() {
@@ -2571,8 +2598,9 @@ type Message27300 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field27302    []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field27302" json:"field27302,omitempty"`
-	Field27303    *string               `protobuf:"bytes,2,opt,name=field27303" json:"field27303,omitempty"`
+
+	Field27302 []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field27302" json:"field27302,omitempty"`
+	Field27303 *string               `protobuf:"bytes,2,opt,name=field27303" json:"field27303,omitempty"`
 }
 
 func (x *Message27300) Reset() {
@@ -2620,29 +2648,30 @@ type Message27453 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field27459    *string             `protobuf:"bytes,15,opt,name=field27459" json:"field27459,omitempty"`
-	Field27460    []string            `protobuf:"bytes,1,rep,name=field27460" json:"field27460,omitempty"`
-	Field27461    []float32           `protobuf:"fixed32,6,rep,name=field27461" json:"field27461,omitempty"`
-	Field27462    []int32             `protobuf:"varint,27,rep,name=field27462" json:"field27462,omitempty"`
-	Field27463    []int32             `protobuf:"varint,28,rep,name=field27463" json:"field27463,omitempty"`
-	Field27464    []*Message27454     `protobuf:"bytes,24,rep,name=field27464" json:"field27464,omitempty"`
-	Field27465    []string            `protobuf:"bytes,2,rep,name=field27465" json:"field27465,omitempty"`
-	Field27466    []float32           `protobuf:"fixed32,7,rep,name=field27466" json:"field27466,omitempty"`
-	Field27467    []string            `protobuf:"bytes,22,rep,name=field27467" json:"field27467,omitempty"`
-	Field27468    []string            `protobuf:"bytes,23,rep,name=field27468" json:"field27468,omitempty"`
-	Field27469    *string             `protobuf:"bytes,26,opt,name=field27469" json:"field27469,omitempty"`
-	Field27470    []*Message27357     `protobuf:"bytes,8,rep,name=field27470" json:"field27470,omitempty"`
-	Field27471    *Message27360       `protobuf:"bytes,16,opt,name=field27471" json:"field27471,omitempty"`
-	Field27472    *string             `protobuf:"bytes,25,opt,name=field27472" json:"field27472,omitempty"`
-	Field27473    *string             `protobuf:"bytes,11,opt,name=field27473" json:"field27473,omitempty"`
-	Field27474    *bool               `protobuf:"varint,13,opt,name=field27474" json:"field27474,omitempty"`
-	Field27475    *bool               `protobuf:"varint,14,opt,name=field27475" json:"field27475,omitempty"`
-	Field27476    *bool               `protobuf:"varint,17,opt,name=field27476" json:"field27476,omitempty"`
-	Field27477    *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field27477" json:"field27477,omitempty"`
-	Field27478    *bool               `protobuf:"varint,34268945,opt,name=field27478" json:"field27478,omitempty"`
-	Field27479    *bool               `protobuf:"varint,20,opt,name=field27479" json:"field27479,omitempty"`
-	Field27480    *string             `protobuf:"bytes,21,opt,name=field27480" json:"field27480,omitempty"`
-	Field27481    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field27481" json:"field27481,omitempty"`
+
+	Field27459 *string             `protobuf:"bytes,15,opt,name=field27459" json:"field27459,omitempty"`
+	Field27460 []string            `protobuf:"bytes,1,rep,name=field27460" json:"field27460,omitempty"`
+	Field27461 []float32           `protobuf:"fixed32,6,rep,name=field27461" json:"field27461,omitempty"`
+	Field27462 []int32             `protobuf:"varint,27,rep,name=field27462" json:"field27462,omitempty"`
+	Field27463 []int32             `protobuf:"varint,28,rep,name=field27463" json:"field27463,omitempty"`
+	Field27464 []*Message27454     `protobuf:"bytes,24,rep,name=field27464" json:"field27464,omitempty"`
+	Field27465 []string            `protobuf:"bytes,2,rep,name=field27465" json:"field27465,omitempty"`
+	Field27466 []float32           `protobuf:"fixed32,7,rep,name=field27466" json:"field27466,omitempty"`
+	Field27467 []string            `protobuf:"bytes,22,rep,name=field27467" json:"field27467,omitempty"`
+	Field27468 []string            `protobuf:"bytes,23,rep,name=field27468" json:"field27468,omitempty"`
+	Field27469 *string             `protobuf:"bytes,26,opt,name=field27469" json:"field27469,omitempty"`
+	Field27470 []*Message27357     `protobuf:"bytes,8,rep,name=field27470" json:"field27470,omitempty"`
+	Field27471 *Message27360       `protobuf:"bytes,16,opt,name=field27471" json:"field27471,omitempty"`
+	Field27472 *string             `protobuf:"bytes,25,opt,name=field27472" json:"field27472,omitempty"`
+	Field27473 *string             `protobuf:"bytes,11,opt,name=field27473" json:"field27473,omitempty"`
+	Field27474 *bool               `protobuf:"varint,13,opt,name=field27474" json:"field27474,omitempty"`
+	Field27475 *bool               `protobuf:"varint,14,opt,name=field27475" json:"field27475,omitempty"`
+	Field27476 *bool               `protobuf:"varint,17,opt,name=field27476" json:"field27476,omitempty"`
+	Field27477 *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field27477" json:"field27477,omitempty"`
+	Field27478 *bool               `protobuf:"varint,34268945,opt,name=field27478" json:"field27478,omitempty"`
+	Field27479 *bool               `protobuf:"varint,20,opt,name=field27479" json:"field27479,omitempty"`
+	Field27480 *string             `protobuf:"bytes,21,opt,name=field27480" json:"field27480,omitempty"`
+	Field27481 *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field27481" json:"field27481,omitempty"`
 }
 
 func (x *Message27453) Reset() {
@@ -2837,8 +2866,9 @@ type Message3672_Message3673 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3738     *Enum3476 `protobuf:"varint,4,req,name=field3738,enum=benchmarks.google_message3.Enum3476" json:"field3738,omitempty"`
-	Field3739     *int32    `protobuf:"varint,5,req,name=field3739" json:"field3739,omitempty"`
+
+	Field3738 *Enum3476 `protobuf:"varint,4,req,name=field3738,enum=benchmarks.google_message3.Enum3476" json:"field3738,omitempty"`
+	Field3739 *int32    `protobuf:"varint,5,req,name=field3739" json:"field3739,omitempty"`
 }
 
 func (x *Message3672_Message3673) Reset() {
@@ -2886,8 +2916,9 @@ type Message3672_Message3674 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3740     *Enum3476 `protobuf:"varint,7,req,name=field3740,enum=benchmarks.google_message3.Enum3476" json:"field3740,omitempty"`
-	Field3741     *int32    `protobuf:"varint,8,req,name=field3741" json:"field3741,omitempty"`
+
+	Field3740 *Enum3476 `protobuf:"varint,7,req,name=field3740,enum=benchmarks.google_message3.Enum3476" json:"field3740,omitempty"`
+	Field3741 *int32    `protobuf:"varint,8,req,name=field3741" json:"field3741,omitempty"`
 }
 
 func (x *Message3672_Message3674) Reset() {
@@ -2935,32 +2966,33 @@ type Message17786_Message17787 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field18177    *int32                `protobuf:"varint,2,req,name=field18177" json:"field18177,omitempty"`
-	Field18178    *int32                `protobuf:"varint,3,req,name=field18178" json:"field18178,omitempty"`
-	Field18179    *Message17783         `protobuf:"bytes,4,opt,name=field18179" json:"field18179,omitempty"`
-	Field18180    *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field18180" json:"field18180,omitempty"`
-	Field18181    *UnusedEmptyMessage   `protobuf:"bytes,6,opt,name=field18181" json:"field18181,omitempty"`
-	Field18182    []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field18182" json:"field18182,omitempty"`
-	Field18183    *UnusedEmptyMessage   `protobuf:"bytes,9,opt,name=field18183" json:"field18183,omitempty"`
-	Field18184    *Message17726         `protobuf:"bytes,10,opt,name=field18184" json:"field18184,omitempty"`
-	Field18185    *UnusedEmptyMessage   `protobuf:"bytes,11,opt,name=field18185" json:"field18185,omitempty"`
-	Field18186    *Message16945         `protobuf:"bytes,102,opt,name=field18186" json:"field18186,omitempty"`
-	Field18187    *UnusedEmptyMessage   `protobuf:"bytes,12,opt,name=field18187" json:"field18187,omitempty"`
-	Field18188    *UnusedEmptyMessage   `protobuf:"bytes,13,opt,name=field18188" json:"field18188,omitempty"`
-	Field18189    *UnusedEmptyMessage   `protobuf:"bytes,7,opt,name=field18189" json:"field18189,omitempty"`
-	Field18190    *UnusedEmptyMessage   `protobuf:"bytes,100,opt,name=field18190" json:"field18190,omitempty"`
-	Field18191    *UnusedEmptyMessage   `protobuf:"bytes,101,opt,name=field18191" json:"field18191,omitempty"`
-	Field18192    *UnusedEmptyMessage   `protobuf:"bytes,14,opt,name=field18192" json:"field18192,omitempty"`
-	Field18193    *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field18193" json:"field18193,omitempty"`
-	Field18194    *UnusedEmptyMessage   `protobuf:"bytes,22,opt,name=field18194" json:"field18194,omitempty"`
-	Field18195    *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field18195" json:"field18195,omitempty"`
-	Field18196    *Enum16925            `protobuf:"varint,21,opt,name=field18196,enum=benchmarks.google_message3.Enum16925" json:"field18196,omitempty"`
-	Field18197    *bool                 `protobuf:"varint,18,opt,name=field18197" json:"field18197,omitempty"`
-	Field18198    []UnusedEnum          `protobuf:"varint,23,rep,name=field18198,enum=benchmarks.google_message3.UnusedEnum" json:"field18198,omitempty"`
-	Field18199    *UnusedEmptyMessage   `protobuf:"bytes,15,opt,name=field18199" json:"field18199,omitempty"`
-	Field18200    *string               `protobuf:"bytes,16,opt,name=field18200" json:"field18200,omitempty"`
-	Field18201    *string               `protobuf:"bytes,17,opt,name=field18201" json:"field18201,omitempty"`
-	Field18202    *bool                 `protobuf:"varint,99,opt,name=field18202" json:"field18202,omitempty"`
+
+	Field18177 *int32                `protobuf:"varint,2,req,name=field18177" json:"field18177,omitempty"`
+	Field18178 *int32                `protobuf:"varint,3,req,name=field18178" json:"field18178,omitempty"`
+	Field18179 *Message17783         `protobuf:"bytes,4,opt,name=field18179" json:"field18179,omitempty"`
+	Field18180 *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field18180" json:"field18180,omitempty"`
+	Field18181 *UnusedEmptyMessage   `protobuf:"bytes,6,opt,name=field18181" json:"field18181,omitempty"`
+	Field18182 []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field18182" json:"field18182,omitempty"`
+	Field18183 *UnusedEmptyMessage   `protobuf:"bytes,9,opt,name=field18183" json:"field18183,omitempty"`
+	Field18184 *Message17726         `protobuf:"bytes,10,opt,name=field18184" json:"field18184,omitempty"`
+	Field18185 *UnusedEmptyMessage   `protobuf:"bytes,11,opt,name=field18185" json:"field18185,omitempty"`
+	Field18186 *Message16945         `protobuf:"bytes,102,opt,name=field18186" json:"field18186,omitempty"`
+	Field18187 *UnusedEmptyMessage   `protobuf:"bytes,12,opt,name=field18187" json:"field18187,omitempty"`
+	Field18188 *UnusedEmptyMessage   `protobuf:"bytes,13,opt,name=field18188" json:"field18188,omitempty"`
+	Field18189 *UnusedEmptyMessage   `protobuf:"bytes,7,opt,name=field18189" json:"field18189,omitempty"`
+	Field18190 *UnusedEmptyMessage   `protobuf:"bytes,100,opt,name=field18190" json:"field18190,omitempty"`
+	Field18191 *UnusedEmptyMessage   `protobuf:"bytes,101,opt,name=field18191" json:"field18191,omitempty"`
+	Field18192 *UnusedEmptyMessage   `protobuf:"bytes,14,opt,name=field18192" json:"field18192,omitempty"`
+	Field18193 *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field18193" json:"field18193,omitempty"`
+	Field18194 *UnusedEmptyMessage   `protobuf:"bytes,22,opt,name=field18194" json:"field18194,omitempty"`
+	Field18195 *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field18195" json:"field18195,omitempty"`
+	Field18196 *Enum16925            `protobuf:"varint,21,opt,name=field18196,enum=benchmarks.google_message3.Enum16925" json:"field18196,omitempty"`
+	Field18197 *bool                 `protobuf:"varint,18,opt,name=field18197" json:"field18197,omitempty"`
+	Field18198 []UnusedEnum          `protobuf:"varint,23,rep,name=field18198,enum=benchmarks.google_message3.UnusedEnum" json:"field18198,omitempty"`
+	Field18199 *UnusedEmptyMessage   `protobuf:"bytes,15,opt,name=field18199" json:"field18199,omitempty"`
+	Field18200 *string               `protobuf:"bytes,16,opt,name=field18200" json:"field18200,omitempty"`
+	Field18201 *string               `protobuf:"bytes,17,opt,name=field18201" json:"field18201,omitempty"`
+	Field18202 *bool                 `protobuf:"varint,99,opt,name=field18202" json:"field18202,omitempty"`
 }
 
 func (x *Message17786_Message17787) Reset() {
@@ -3176,37 +3208,38 @@ type Message24404_Message24405 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24686    *int32              `protobuf:"varint,2,req,name=field24686" json:"field24686,omitempty"`
-	Field24687    *int32              `protobuf:"varint,3,req,name=field24687" json:"field24687,omitempty"`
-	Field24688    *Message24317       `protobuf:"bytes,4,opt,name=field24688" json:"field24688,omitempty"`
-	Field24689    *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field24689" json:"field24689,omitempty"`
-	Field24690    *Message24376       `protobuf:"bytes,6,opt,name=field24690" json:"field24690,omitempty"`
-	Field24691    *Message24345       `protobuf:"bytes,7,opt,name=field24691" json:"field24691,omitempty"`
-	Field24692    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field24692" json:"field24692,omitempty"`
-	Field24693    *Message24379       `protobuf:"bytes,9,opt,name=field24693" json:"field24693,omitempty"`
-	Field24694    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field24694" json:"field24694,omitempty"`
-	Field24695    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field24695" json:"field24695,omitempty"`
-	Field24696    *Message24391       `protobuf:"bytes,12,opt,name=field24696" json:"field24696,omitempty"`
-	Field24697    *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field24697" json:"field24697,omitempty"`
-	Field24698    *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field24698" json:"field24698,omitempty"`
-	Field24699    *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field24699" json:"field24699,omitempty"`
-	Field24700    *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field24700" json:"field24700,omitempty"`
-	Field24701    *UnusedEmptyMessage `protobuf:"bytes,25,opt,name=field24701" json:"field24701,omitempty"`
-	Field24702    *Enum16925          `protobuf:"varint,18,opt,name=field24702,enum=benchmarks.google_message3.Enum16925" json:"field24702,omitempty"`
-	Field24703    *float32            `protobuf:"fixed32,20,opt,name=field24703" json:"field24703,omitempty"`
-	Field24704    *bool               `protobuf:"varint,19,opt,name=field24704" json:"field24704,omitempty"`
-	Field24705    []Enum16891         `protobuf:"varint,24,rep,name=field24705,enum=benchmarks.google_message3.Enum16891" json:"field24705,omitempty"`
-	Field24706    *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field24706" json:"field24706,omitempty"`
-	Field24707    *string             `protobuf:"bytes,16,opt,name=field24707" json:"field24707,omitempty"`
-	Field24708    *string             `protobuf:"bytes,17,opt,name=field24708" json:"field24708,omitempty"`
-	Field24709    *float32            `protobuf:"fixed32,21,opt,name=field24709" json:"field24709,omitempty"`
-	Field24710    *bool               `protobuf:"varint,26,opt,name=field24710" json:"field24710,omitempty"`
-	Field24711    *UnusedEnum         `protobuf:"varint,27,opt,name=field24711,enum=benchmarks.google_message3.UnusedEnum" json:"field24711,omitempty"`
-	Field24712    *bool               `protobuf:"varint,28,opt,name=field24712" json:"field24712,omitempty"`
-	Field24713    *UnusedEnum         `protobuf:"varint,29,opt,name=field24713,enum=benchmarks.google_message3.UnusedEnum" json:"field24713,omitempty"`
-	Field24714    *bool               `protobuf:"varint,31,opt,name=field24714" json:"field24714,omitempty"`
-	Field24715    *bool               `protobuf:"varint,99,opt,name=field24715" json:"field24715,omitempty"`
-	Field24716    *int64              `protobuf:"varint,32,opt,name=field24716" json:"field24716,omitempty"`
+
+	Field24686 *int32              `protobuf:"varint,2,req,name=field24686" json:"field24686,omitempty"`
+	Field24687 *int32              `protobuf:"varint,3,req,name=field24687" json:"field24687,omitempty"`
+	Field24688 *Message24317       `protobuf:"bytes,4,opt,name=field24688" json:"field24688,omitempty"`
+	Field24689 *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field24689" json:"field24689,omitempty"`
+	Field24690 *Message24376       `protobuf:"bytes,6,opt,name=field24690" json:"field24690,omitempty"`
+	Field24691 *Message24345       `protobuf:"bytes,7,opt,name=field24691" json:"field24691,omitempty"`
+	Field24692 *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field24692" json:"field24692,omitempty"`
+	Field24693 *Message24379       `protobuf:"bytes,9,opt,name=field24693" json:"field24693,omitempty"`
+	Field24694 *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field24694" json:"field24694,omitempty"`
+	Field24695 *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field24695" json:"field24695,omitempty"`
+	Field24696 *Message24391       `protobuf:"bytes,12,opt,name=field24696" json:"field24696,omitempty"`
+	Field24697 *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field24697" json:"field24697,omitempty"`
+	Field24698 *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field24698" json:"field24698,omitempty"`
+	Field24699 *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field24699" json:"field24699,omitempty"`
+	Field24700 *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field24700" json:"field24700,omitempty"`
+	Field24701 *UnusedEmptyMessage `protobuf:"bytes,25,opt,name=field24701" json:"field24701,omitempty"`
+	Field24702 *Enum16925          `protobuf:"varint,18,opt,name=field24702,enum=benchmarks.google_message3.Enum16925" json:"field24702,omitempty"`
+	Field24703 *float32            `protobuf:"fixed32,20,opt,name=field24703" json:"field24703,omitempty"`
+	Field24704 *bool               `protobuf:"varint,19,opt,name=field24704" json:"field24704,omitempty"`
+	Field24705 []Enum16891         `protobuf:"varint,24,rep,name=field24705,enum=benchmarks.google_message3.Enum16891" json:"field24705,omitempty"`
+	Field24706 *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field24706" json:"field24706,omitempty"`
+	Field24707 *string             `protobuf:"bytes,16,opt,name=field24707" json:"field24707,omitempty"`
+	Field24708 *string             `protobuf:"bytes,17,opt,name=field24708" json:"field24708,omitempty"`
+	Field24709 *float32            `protobuf:"fixed32,21,opt,name=field24709" json:"field24709,omitempty"`
+	Field24710 *bool               `protobuf:"varint,26,opt,name=field24710" json:"field24710,omitempty"`
+	Field24711 *UnusedEnum         `protobuf:"varint,27,opt,name=field24711,enum=benchmarks.google_message3.UnusedEnum" json:"field24711,omitempty"`
+	Field24712 *bool               `protobuf:"varint,28,opt,name=field24712" json:"field24712,omitempty"`
+	Field24713 *UnusedEnum         `protobuf:"varint,29,opt,name=field24713,enum=benchmarks.google_message3.UnusedEnum" json:"field24713,omitempty"`
+	Field24714 *bool               `protobuf:"varint,31,opt,name=field24714" json:"field24714,omitempty"`
+	Field24715 *bool               `protobuf:"varint,99,opt,name=field24715" json:"field24715,omitempty"`
+	Field24716 *int64              `protobuf:"varint,32,opt,name=field24716" json:"field24716,omitempty"`
 }
 
 func (x *Message24404_Message24405) Reset() {

internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go

@@ -21,18 +21,19 @@ type Message35546 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field35556    *int64                     `protobuf:"varint,1,opt,name=field35556" json:"field35556,omitempty"`
-	Field35557    *int32                     `protobuf:"varint,2,opt,name=field35557" json:"field35557,omitempty"`
-	Field35558    *bool                      `protobuf:"varint,3,opt,name=field35558" json:"field35558,omitempty"`
-	Field35559    *int64                     `protobuf:"varint,13,opt,name=field35559" json:"field35559,omitempty"`
-	Message35547  *Message35546_Message35547 `protobuf:"group,4,opt,name=Message35547,json=message35547" json:"message35547,omitempty"`
-	Message35548  *Message35546_Message35548 `protobuf:"group,10,opt,name=Message35548,json=message35548" json:"message35548,omitempty"`
-	Field35562    *bool                      `protobuf:"varint,14,opt,name=field35562" json:"field35562,omitempty"`
-	Field35563    *bool                      `protobuf:"varint,15,opt,name=field35563" json:"field35563,omitempty"`
-	Field35564    *int32                     `protobuf:"varint,16,opt,name=field35564" json:"field35564,omitempty"`
-	Field35565    *bool                      `protobuf:"varint,17,opt,name=field35565" json:"field35565,omitempty"`
-	Field35566    *bool                      `protobuf:"varint,18,opt,name=field35566" json:"field35566,omitempty"`
-	Field35567    *string                    `protobuf:"bytes,100,opt,name=field35567" json:"field35567,omitempty"`
+
+	Field35556   *int64                     `protobuf:"varint,1,opt,name=field35556" json:"field35556,omitempty"`
+	Field35557   *int32                     `protobuf:"varint,2,opt,name=field35557" json:"field35557,omitempty"`
+	Field35558   *bool                      `protobuf:"varint,3,opt,name=field35558" json:"field35558,omitempty"`
+	Field35559   *int64                     `protobuf:"varint,13,opt,name=field35559" json:"field35559,omitempty"`
+	Message35547 *Message35546_Message35547 `protobuf:"group,4,opt,name=Message35547,json=message35547" json:"message35547,omitempty"`
+	Message35548 *Message35546_Message35548 `protobuf:"group,10,opt,name=Message35548,json=message35548" json:"message35548,omitempty"`
+	Field35562   *bool                      `protobuf:"varint,14,opt,name=field35562" json:"field35562,omitempty"`
+	Field35563   *bool                      `protobuf:"varint,15,opt,name=field35563" json:"field35563,omitempty"`
+	Field35564   *int32                     `protobuf:"varint,16,opt,name=field35564" json:"field35564,omitempty"`
+	Field35565   *bool                      `protobuf:"varint,17,opt,name=field35565" json:"field35565,omitempty"`
+	Field35566   *bool                      `protobuf:"varint,18,opt,name=field35566" json:"field35566,omitempty"`
+	Field35567   *string                    `protobuf:"bytes,100,opt,name=field35567" json:"field35567,omitempty"`
 }
 
 func (x *Message35546) Reset() {
@@ -150,37 +151,38 @@ type Message2356 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field2368     *Message1374               `protobuf:"bytes,121,opt,name=field2368" json:"field2368,omitempty"`
-	Field2369     *uint64                    `protobuf:"varint,1,opt,name=field2369" json:"field2369,omitempty"`
-	Field2370     *int32                     `protobuf:"varint,2,opt,name=field2370" json:"field2370,omitempty"`
-	Field2371     *int32                     `protobuf:"varint,17,opt,name=field2371" json:"field2371,omitempty"`
-	Field2372     *string                    `protobuf:"bytes,3,req,name=field2372" json:"field2372,omitempty"`
-	Field2373     *int32                     `protobuf:"varint,7,opt,name=field2373" json:"field2373,omitempty"`
-	Field2374     []byte                     `protobuf:"bytes,8,opt,name=field2374" json:"field2374,omitempty"`
-	Field2375     *string                    `protobuf:"bytes,4,opt,name=field2375" json:"field2375,omitempty"`
-	Field2376     *string                    `protobuf:"bytes,101,opt,name=field2376" json:"field2376,omitempty"`
-	Field2377     *int32                     `protobuf:"varint,102,opt,name=field2377" json:"field2377,omitempty"`
-	Field2378     *int32                     `protobuf:"varint,103,opt,name=field2378" json:"field2378,omitempty"`
-	Field2379     *int32                     `protobuf:"varint,104,opt,name=field2379" json:"field2379,omitempty"`
-	Field2380     *int32                     `protobuf:"varint,113,opt,name=field2380" json:"field2380,omitempty"`
-	Field2381     *int32                     `protobuf:"varint,114,opt,name=field2381" json:"field2381,omitempty"`
-	Field2382     *int32                     `protobuf:"varint,115,opt,name=field2382" json:"field2382,omitempty"`
-	Field2383     *int32                     `protobuf:"varint,117,opt,name=field2383" json:"field2383,omitempty"`
-	Field2384     *int32                     `protobuf:"varint,118,opt,name=field2384" json:"field2384,omitempty"`
-	Field2385     *int32                     `protobuf:"varint,119,opt,name=field2385" json:"field2385,omitempty"`
-	Field2386     *int32                     `protobuf:"varint,105,opt,name=field2386" json:"field2386,omitempty"`
-	Field2387     []byte                     `protobuf:"bytes,5,opt,name=field2387" json:"field2387,omitempty"`
-	Message2357   *Message2356_Message2357   `protobuf:"group,6,opt,name=Message2357,json=message2357" json:"message2357,omitempty"`
-	Field2389     *string                    `protobuf:"bytes,120,opt,name=field2389" json:"field2389,omitempty"`
-	Message2358   *Message2356_Message2358   `protobuf:"group,107,opt,name=Message2358,json=message2358" json:"message2358,omitempty"`
-	Message2359   []*Message2356_Message2359 `protobuf:"group,40,rep,name=Message2359,json=message2359" json:"message2359,omitempty"`
-	Field2392     *int32                     `protobuf:"varint,50,opt,name=field2392" json:"field2392,omitempty"`
-	Field2393     *UnusedEmptyMessage        `protobuf:"bytes,60,opt,name=field2393" json:"field2393,omitempty"`
-	Field2394     *UnusedEmptyMessage        `protobuf:"bytes,70,opt,name=field2394" json:"field2394,omitempty"`
-	Field2395     *UnusedEmptyMessage        `protobuf:"bytes,80,opt,name=field2395" json:"field2395,omitempty"`
-	Field2396     *UnusedEmptyMessage        `protobuf:"bytes,90,opt,name=field2396" json:"field2396,omitempty"`
-	Field2397     *string                    `protobuf:"bytes,100,opt,name=field2397" json:"field2397,omitempty"`
-	Field2398     *string                    `protobuf:"bytes,123,opt,name=field2398" json:"field2398,omitempty"`
+
+	Field2368   *Message1374               `protobuf:"bytes,121,opt,name=field2368" json:"field2368,omitempty"`
+	Field2369   *uint64                    `protobuf:"varint,1,opt,name=field2369" json:"field2369,omitempty"`
+	Field2370   *int32                     `protobuf:"varint,2,opt,name=field2370" json:"field2370,omitempty"`
+	Field2371   *int32                     `protobuf:"varint,17,opt,name=field2371" json:"field2371,omitempty"`
+	Field2372   *string                    `protobuf:"bytes,3,req,name=field2372" json:"field2372,omitempty"`
+	Field2373   *int32                     `protobuf:"varint,7,opt,name=field2373" json:"field2373,omitempty"`
+	Field2374   []byte                     `protobuf:"bytes,8,opt,name=field2374" json:"field2374,omitempty"`
+	Field2375   *string                    `protobuf:"bytes,4,opt,name=field2375" json:"field2375,omitempty"`
+	Field2376   *string                    `protobuf:"bytes,101,opt,name=field2376" json:"field2376,omitempty"`
+	Field2377   *int32                     `protobuf:"varint,102,opt,name=field2377" json:"field2377,omitempty"`
+	Field2378   *int32                     `protobuf:"varint,103,opt,name=field2378" json:"field2378,omitempty"`
+	Field2379   *int32                     `protobuf:"varint,104,opt,name=field2379" json:"field2379,omitempty"`
+	Field2380   *int32                     `protobuf:"varint,113,opt,name=field2380" json:"field2380,omitempty"`
+	Field2381   *int32                     `protobuf:"varint,114,opt,name=field2381" json:"field2381,omitempty"`
+	Field2382   *int32                     `protobuf:"varint,115,opt,name=field2382" json:"field2382,omitempty"`
+	Field2383   *int32                     `protobuf:"varint,117,opt,name=field2383" json:"field2383,omitempty"`
+	Field2384   *int32                     `protobuf:"varint,118,opt,name=field2384" json:"field2384,omitempty"`
+	Field2385   *int32                     `protobuf:"varint,119,opt,name=field2385" json:"field2385,omitempty"`
+	Field2386   *int32                     `protobuf:"varint,105,opt,name=field2386" json:"field2386,omitempty"`
+	Field2387   []byte                     `protobuf:"bytes,5,opt,name=field2387" json:"field2387,omitempty"`
+	Message2357 *Message2356_Message2357   `protobuf:"group,6,opt,name=Message2357,json=message2357" json:"message2357,omitempty"`
+	Field2389   *string                    `protobuf:"bytes,120,opt,name=field2389" json:"field2389,omitempty"`
+	Message2358 *Message2356_Message2358   `protobuf:"group,107,opt,name=Message2358,json=message2358" json:"message2358,omitempty"`
+	Message2359 []*Message2356_Message2359 `protobuf:"group,40,rep,name=Message2359,json=message2359" json:"message2359,omitempty"`
+	Field2392   *int32                     `protobuf:"varint,50,opt,name=field2392" json:"field2392,omitempty"`
+	Field2393   *UnusedEmptyMessage        `protobuf:"bytes,60,opt,name=field2393" json:"field2393,omitempty"`
+	Field2394   *UnusedEmptyMessage        `protobuf:"bytes,70,opt,name=field2394" json:"field2394,omitempty"`
+	Field2395   *UnusedEmptyMessage        `protobuf:"bytes,80,opt,name=field2395" json:"field2395,omitempty"`
+	Field2396   *UnusedEmptyMessage        `protobuf:"bytes,90,opt,name=field2396" json:"field2396,omitempty"`
+	Field2397   *string                    `protobuf:"bytes,100,opt,name=field2397" json:"field2397,omitempty"`
+	Field2398   *string                    `protobuf:"bytes,123,opt,name=field2398" json:"field2398,omitempty"`
 }
 
 func (x *Message2356) Reset() {
@@ -431,48 +433,49 @@ type Message7029 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7183     *int32                     `protobuf:"varint,1,req,name=field7183" json:"field7183,omitempty"`
-	Field7184     *int32                     `protobuf:"varint,2,opt,name=field7184" json:"field7184,omitempty"`
-	Field7185     *int32                     `protobuf:"varint,3,opt,name=field7185" json:"field7185,omitempty"`
-	Field7186     *int32                     `protobuf:"varint,4,opt,name=field7186" json:"field7186,omitempty"`
-	Field7187     *int32                     `protobuf:"varint,5,opt,name=field7187" json:"field7187,omitempty"`
-	Field7188     *int32                     `protobuf:"varint,6,opt,name=field7188" json:"field7188,omitempty"`
-	Field7189     *int32                     `protobuf:"varint,17,opt,name=field7189" json:"field7189,omitempty"`
-	Field7190     *int32                     `protobuf:"varint,18,opt,name=field7190" json:"field7190,omitempty"`
-	Field7191     *int32                     `protobuf:"varint,49,opt,name=field7191" json:"field7191,omitempty"`
-	Field7192     *int32                     `protobuf:"varint,28,opt,name=field7192" json:"field7192,omitempty"`
-	Field7193     *int32                     `protobuf:"varint,33,opt,name=field7193" json:"field7193,omitempty"`
-	Field7194     *int32                     `protobuf:"varint,25,opt,name=field7194" json:"field7194,omitempty"`
-	Field7195     *int32                     `protobuf:"varint,26,opt,name=field7195" json:"field7195,omitempty"`
-	Field7196     *int32                     `protobuf:"varint,40,opt,name=field7196" json:"field7196,omitempty"`
-	Field7197     *int32                     `protobuf:"varint,41,opt,name=field7197" json:"field7197,omitempty"`
-	Field7198     *int32                     `protobuf:"varint,42,opt,name=field7198" json:"field7198,omitempty"`
-	Field7199     *int32                     `protobuf:"varint,43,opt,name=field7199" json:"field7199,omitempty"`
-	Field7200     *int32                     `protobuf:"varint,19,opt,name=field7200" json:"field7200,omitempty"`
-	Field7201     *int32                     `protobuf:"varint,7,opt,name=field7201" json:"field7201,omitempty"`
-	Field7202     *int32                     `protobuf:"varint,8,opt,name=field7202" json:"field7202,omitempty"`
-	Field7203     *int32                     `protobuf:"varint,9,opt,name=field7203" json:"field7203,omitempty"`
-	Field7204     *int32                     `protobuf:"varint,10,opt,name=field7204" json:"field7204,omitempty"`
-	Field7205     *int32                     `protobuf:"varint,11,opt,name=field7205" json:"field7205,omitempty"`
-	Field7206     *int32                     `protobuf:"varint,12,opt,name=field7206" json:"field7206,omitempty"`
-	Message7030   []*Message7029_Message7030 `protobuf:"group,13,rep,name=Message7030,json=message7030" json:"message7030,omitempty"`
-	Message7031   []*Message7029_Message7031 `protobuf:"group,21,rep,name=Message7031,json=message7031" json:"message7031,omitempty"`
-	Field7209     *int32                     `protobuf:"varint,20,opt,name=field7209" json:"field7209,omitempty"`
-	Field7210     *float32                   `protobuf:"fixed32,27,opt,name=field7210" json:"field7210,omitempty"`
-	Field7211     *int32                     `protobuf:"varint,29,opt,name=field7211" json:"field7211,omitempty"`
-	Field7212     *int32                     `protobuf:"varint,32,opt,name=field7212" json:"field7212,omitempty"`
-	Field7213     *string                    `protobuf:"bytes,48,opt,name=field7213" json:"field7213,omitempty"`
-	Field7214     *bool                      `protobuf:"varint,34,opt,name=field7214" json:"field7214,omitempty"`
-	Field7215     *int32                     `protobuf:"varint,36,opt,name=field7215" json:"field7215,omitempty"`
-	Field7216     *float32                   `protobuf:"fixed32,37,opt,name=field7216" json:"field7216,omitempty"`
-	Field7217     *bool                      `protobuf:"varint,38,opt,name=field7217" json:"field7217,omitempty"`
-	Field7218     *bool                      `protobuf:"varint,39,opt,name=field7218" json:"field7218,omitempty"`
-	Field7219     *UnusedEmptyMessage        `protobuf:"bytes,44,opt,name=field7219" json:"field7219,omitempty"`
-	Field7220     *int32                     `protobuf:"varint,45,opt,name=field7220" json:"field7220,omitempty"`
-	Field7221     *int32                     `protobuf:"varint,46,opt,name=field7221" json:"field7221,omitempty"`
-	Field7222     *int32                     `protobuf:"varint,47,opt,name=field7222" json:"field7222,omitempty"`
-	Field7223     *UnusedEmptyMessage        `protobuf:"bytes,50,opt,name=field7223" json:"field7223,omitempty"`
-	Field7224     *int32                     `protobuf:"varint,51,opt,name=field7224" json:"field7224,omitempty"`
+
+	Field7183   *int32                     `protobuf:"varint,1,req,name=field7183" json:"field7183,omitempty"`
+	Field7184   *int32                     `protobuf:"varint,2,opt,name=field7184" json:"field7184,omitempty"`
+	Field7185   *int32                     `protobuf:"varint,3,opt,name=field7185" json:"field7185,omitempty"`
+	Field7186   *int32                     `protobuf:"varint,4,opt,name=field7186" json:"field7186,omitempty"`
+	Field7187   *int32                     `protobuf:"varint,5,opt,name=field7187" json:"field7187,omitempty"`
+	Field7188   *int32                     `protobuf:"varint,6,opt,name=field7188" json:"field7188,omitempty"`
+	Field7189   *int32                     `protobuf:"varint,17,opt,name=field7189" json:"field7189,omitempty"`
+	Field7190   *int32                     `protobuf:"varint,18,opt,name=field7190" json:"field7190,omitempty"`
+	Field7191   *int32                     `protobuf:"varint,49,opt,name=field7191" json:"field7191,omitempty"`
+	Field7192   *int32                     `protobuf:"varint,28,opt,name=field7192" json:"field7192,omitempty"`
+	Field7193   *int32                     `protobuf:"varint,33,opt,name=field7193" json:"field7193,omitempty"`
+	Field7194   *int32                     `protobuf:"varint,25,opt,name=field7194" json:"field7194,omitempty"`
+	Field7195   *int32                     `protobuf:"varint,26,opt,name=field7195" json:"field7195,omitempty"`
+	Field7196   *int32                     `protobuf:"varint,40,opt,name=field7196" json:"field7196,omitempty"`
+	Field7197   *int32                     `protobuf:"varint,41,opt,name=field7197" json:"field7197,omitempty"`
+	Field7198   *int32                     `protobuf:"varint,42,opt,name=field7198" json:"field7198,omitempty"`
+	Field7199   *int32                     `protobuf:"varint,43,opt,name=field7199" json:"field7199,omitempty"`
+	Field7200   *int32                     `protobuf:"varint,19,opt,name=field7200" json:"field7200,omitempty"`
+	Field7201   *int32                     `protobuf:"varint,7,opt,name=field7201" json:"field7201,omitempty"`
+	Field7202   *int32                     `protobuf:"varint,8,opt,name=field7202" json:"field7202,omitempty"`
+	Field7203   *int32                     `protobuf:"varint,9,opt,name=field7203" json:"field7203,omitempty"`
+	Field7204   *int32                     `protobuf:"varint,10,opt,name=field7204" json:"field7204,omitempty"`
+	Field7205   *int32                     `protobuf:"varint,11,opt,name=field7205" json:"field7205,omitempty"`
+	Field7206   *int32                     `protobuf:"varint,12,opt,name=field7206" json:"field7206,omitempty"`
+	Message7030 []*Message7029_Message7030 `protobuf:"group,13,rep,name=Message7030,json=message7030" json:"message7030,omitempty"`
+	Message7031 []*Message7029_Message7031 `protobuf:"group,21,rep,name=Message7031,json=message7031" json:"message7031,omitempty"`
+	Field7209   *int32                     `protobuf:"varint,20,opt,name=field7209" json:"field7209,omitempty"`
+	Field7210   *float32                   `protobuf:"fixed32,27,opt,name=field7210" json:"field7210,omitempty"`
+	Field7211   *int32                     `protobuf:"varint,29,opt,name=field7211" json:"field7211,omitempty"`
+	Field7212   *int32                     `protobuf:"varint,32,opt,name=field7212" json:"field7212,omitempty"`
+	Field7213   *string                    `protobuf:"bytes,48,opt,name=field7213" json:"field7213,omitempty"`
+	Field7214   *bool                      `protobuf:"varint,34,opt,name=field7214" json:"field7214,omitempty"`
+	Field7215   *int32                     `protobuf:"varint,36,opt,name=field7215" json:"field7215,omitempty"`
+	Field7216   *float32                   `protobuf:"fixed32,37,opt,name=field7216" json:"field7216,omitempty"`
+	Field7217   *bool                      `protobuf:"varint,38,opt,name=field7217" json:"field7217,omitempty"`
+	Field7218   *bool                      `protobuf:"varint,39,opt,name=field7218" json:"field7218,omitempty"`
+	Field7219   *UnusedEmptyMessage        `protobuf:"bytes,44,opt,name=field7219" json:"field7219,omitempty"`
+	Field7220   *int32                     `protobuf:"varint,45,opt,name=field7220" json:"field7220,omitempty"`
+	Field7221   *int32                     `protobuf:"varint,46,opt,name=field7221" json:"field7221,omitempty"`
+	Field7222   *int32                     `protobuf:"varint,47,opt,name=field7222" json:"field7222,omitempty"`
+	Field7223   *UnusedEmptyMessage        `protobuf:"bytes,50,opt,name=field7223" json:"field7223,omitempty"`
+	Field7224   *int32                     `protobuf:"varint,51,opt,name=field7224" json:"field7224,omitempty"`
 }
 
 func (x *Message7029) Reset() {
@@ -800,7 +803,8 @@ type Message35538 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field35539    *int64 `protobuf:"varint,1,req,name=field35539" json:"field35539,omitempty"`
+
+	Field35539 *int64 `protobuf:"varint,1,req,name=field35539" json:"field35539,omitempty"`
 }
 
 func (x *Message35538) Reset() {
@@ -841,18 +845,19 @@ type Message18921 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field18946    *string                      `protobuf:"bytes,1,opt,name=field18946" json:"field18946,omitempty"`
-	Field18947    *uint64                      `protobuf:"fixed64,2,opt,name=field18947" json:"field18947,omitempty"`
-	Field18948    *int32                       `protobuf:"varint,3,opt,name=field18948" json:"field18948,omitempty"`
-	Field18949    *float64                     `protobuf:"fixed64,4,opt,name=field18949" json:"field18949,omitempty"`
-	Field18950    *bool                        `protobuf:"varint,17,opt,name=field18950" json:"field18950,omitempty"`
-	Field18951    *bool                        `protobuf:"varint,23,opt,name=field18951" json:"field18951,omitempty"`
-	Field18952    *UnusedEmptyMessage          `protobuf:"bytes,24,opt,name=field18952" json:"field18952,omitempty"`
-	Message18922  []*Message18921_Message18922 `protobuf:"group,5,rep,name=Message18922,json=message18922" json:"message18922,omitempty"`
-	Field18954    []*UnusedEmptyMessage        `protobuf:"bytes,29,rep,name=field18954" json:"field18954,omitempty"`
-	Field18955    []*Message18943              `protobuf:"bytes,30,rep,name=field18955" json:"field18955,omitempty"`
-	Field18956    []*Message18944              `protobuf:"bytes,31,rep,name=field18956" json:"field18956,omitempty"`
-	Field18957    []*UnusedEmptyMessage        `protobuf:"bytes,32,rep,name=field18957" json:"field18957,omitempty"`
+
+	Field18946   *string                      `protobuf:"bytes,1,opt,name=field18946" json:"field18946,omitempty"`
+	Field18947   *uint64                      `protobuf:"fixed64,2,opt,name=field18947" json:"field18947,omitempty"`
+	Field18948   *int32                       `protobuf:"varint,3,opt,name=field18948" json:"field18948,omitempty"`
+	Field18949   *float64                     `protobuf:"fixed64,4,opt,name=field18949" json:"field18949,omitempty"`
+	Field18950   *bool                        `protobuf:"varint,17,opt,name=field18950" json:"field18950,omitempty"`
+	Field18951   *bool                        `protobuf:"varint,23,opt,name=field18951" json:"field18951,omitempty"`
+	Field18952   *UnusedEmptyMessage          `protobuf:"bytes,24,opt,name=field18952" json:"field18952,omitempty"`
+	Message18922 []*Message18921_Message18922 `protobuf:"group,5,rep,name=Message18922,json=message18922" json:"message18922,omitempty"`
+	Field18954   []*UnusedEmptyMessage        `protobuf:"bytes,29,rep,name=field18954" json:"field18954,omitempty"`
+	Field18955   []*Message18943              `protobuf:"bytes,30,rep,name=field18955" json:"field18955,omitempty"`
+	Field18956   []*Message18944              `protobuf:"bytes,31,rep,name=field18956" json:"field18956,omitempty"`
+	Field18957   []*UnusedEmptyMessage        `protobuf:"bytes,32,rep,name=field18957" json:"field18957,omitempty"`
 }
 
 func (x *Message18921) Reset() {
@@ -970,7 +975,8 @@ type Message35540 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field35541    *bool `protobuf:"varint,1,opt,name=field35541" json:"field35541,omitempty"`
+
+	Field35541 *bool `protobuf:"varint,1,opt,name=field35541" json:"field35541,omitempty"`
 }
 
 func (x *Message35540) Reset() {
@@ -1011,7 +1017,8 @@ type Message3886 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Message3887   []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
+
+	Message3887 []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
 }
 
 func (x *Message3886) Reset() {
@@ -1052,14 +1059,15 @@ type Message6743 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6759     *Message6721 `protobuf:"bytes,1,opt,name=field6759" json:"field6759,omitempty"`
-	Field6760     *Message6723 `protobuf:"bytes,2,opt,name=field6760" json:"field6760,omitempty"`
-	Field6761     *Message6723 `protobuf:"bytes,8,opt,name=field6761" json:"field6761,omitempty"`
-	Field6762     *Message6725 `protobuf:"bytes,3,opt,name=field6762" json:"field6762,omitempty"`
-	Field6763     *Message6726 `protobuf:"bytes,4,opt,name=field6763" json:"field6763,omitempty"`
-	Field6764     *Message6733 `protobuf:"bytes,5,opt,name=field6764" json:"field6764,omitempty"`
-	Field6765     *Message6734 `protobuf:"bytes,6,opt,name=field6765" json:"field6765,omitempty"`
-	Field6766     *Message6742 `protobuf:"bytes,7,opt,name=field6766" json:"field6766,omitempty"`
+
+	Field6759 *Message6721 `protobuf:"bytes,1,opt,name=field6759" json:"field6759,omitempty"`
+	Field6760 *Message6723 `protobuf:"bytes,2,opt,name=field6760" json:"field6760,omitempty"`
+	Field6761 *Message6723 `protobuf:"bytes,8,opt,name=field6761" json:"field6761,omitempty"`
+	Field6762 *Message6725 `protobuf:"bytes,3,opt,name=field6762" json:"field6762,omitempty"`
+	Field6763 *Message6726 `protobuf:"bytes,4,opt,name=field6763" json:"field6763,omitempty"`
+	Field6764 *Message6733 `protobuf:"bytes,5,opt,name=field6764" json:"field6764,omitempty"`
+	Field6765 *Message6734 `protobuf:"bytes,6,opt,name=field6765" json:"field6765,omitempty"`
+	Field6766 *Message6742 `protobuf:"bytes,7,opt,name=field6766" json:"field6766,omitempty"`
 }
 
 func (x *Message6743) Reset() {
@@ -1149,16 +1157,17 @@ type Message6773 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6794     *Enum6769   `protobuf:"varint,1,opt,name=field6794,enum=benchmarks.google_message3.Enum6769" json:"field6794,omitempty"`
-	Field6795     *int32      `protobuf:"varint,9,opt,name=field6795" json:"field6795,omitempty"`
-	Field6796     *UnusedEnum `protobuf:"varint,10,opt,name=field6796,enum=benchmarks.google_message3.UnusedEnum" json:"field6796,omitempty"`
-	Field6797     *int32      `protobuf:"varint,11,opt,name=field6797" json:"field6797,omitempty"`
-	Field6798     *int32      `protobuf:"varint,2,opt,name=field6798" json:"field6798,omitempty"`
-	Field6799     *Enum6774   `protobuf:"varint,3,opt,name=field6799,enum=benchmarks.google_message3.Enum6774" json:"field6799,omitempty"`
-	Field6800     *float64    `protobuf:"fixed64,5,opt,name=field6800" json:"field6800,omitempty"`
-	Field6801     *float64    `protobuf:"fixed64,7,opt,name=field6801" json:"field6801,omitempty"`
-	Field6802     *float64    `protobuf:"fixed64,8,opt,name=field6802" json:"field6802,omitempty"`
-	Field6803     *Enum6782   `protobuf:"varint,6,opt,name=field6803,enum=benchmarks.google_message3.Enum6782" json:"field6803,omitempty"`
+
+	Field6794 *Enum6769   `protobuf:"varint,1,opt,name=field6794,enum=benchmarks.google_message3.Enum6769" json:"field6794,omitempty"`
+	Field6795 *int32      `protobuf:"varint,9,opt,name=field6795" json:"field6795,omitempty"`
+	Field6796 *UnusedEnum `protobuf:"varint,10,opt,name=field6796,enum=benchmarks.google_message3.UnusedEnum" json:"field6796,omitempty"`
+	Field6797 *int32      `protobuf:"varint,11,opt,name=field6797" json:"field6797,omitempty"`
+	Field6798 *int32      `protobuf:"varint,2,opt,name=field6798" json:"field6798,omitempty"`
+	Field6799 *Enum6774   `protobuf:"varint,3,opt,name=field6799,enum=benchmarks.google_message3.Enum6774" json:"field6799,omitempty"`
+	Field6800 *float64    `protobuf:"fixed64,5,opt,name=field6800" json:"field6800,omitempty"`
+	Field6801 *float64    `protobuf:"fixed64,7,opt,name=field6801" json:"field6801,omitempty"`
+	Field6802 *float64    `protobuf:"fixed64,8,opt,name=field6802" json:"field6802,omitempty"`
+	Field6803 *Enum6782   `protobuf:"varint,6,opt,name=field6803,enum=benchmarks.google_message3.Enum6782" json:"field6803,omitempty"`
 }
 
 func (x *Message6773) Reset() {
@@ -1262,33 +1271,34 @@ type Message8224 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8255     *UnusedEmptyMessage   `protobuf:"bytes,1,opt,name=field8255" json:"field8255,omitempty"`
-	Field8256     *Message8184          `protobuf:"bytes,2,opt,name=field8256" json:"field8256,omitempty"`
-	Field8257     *Message7966          `protobuf:"bytes,3,opt,name=field8257" json:"field8257,omitempty"`
-	Field8258     *string               `protobuf:"bytes,4,opt,name=field8258" json:"field8258,omitempty"`
-	Field8259     *string               `protobuf:"bytes,5,opt,name=field8259" json:"field8259,omitempty"`
-	Field8260     *bool                 `protobuf:"varint,6,opt,name=field8260" json:"field8260,omitempty"`
-	Field8261     *int64                `protobuf:"varint,7,opt,name=field8261" json:"field8261,omitempty"`
-	Field8262     *string               `protobuf:"bytes,8,opt,name=field8262" json:"field8262,omitempty"`
-	Field8263     *int64                `protobuf:"varint,9,opt,name=field8263" json:"field8263,omitempty"`
-	Field8264     *float64              `protobuf:"fixed64,10,opt,name=field8264" json:"field8264,omitempty"`
-	Field8265     *int64                `protobuf:"varint,11,opt,name=field8265" json:"field8265,omitempty"`
-	Field8266     []string              `protobuf:"bytes,12,rep,name=field8266" json:"field8266,omitempty"`
-	Field8267     *int64                `protobuf:"varint,13,opt,name=field8267" json:"field8267,omitempty"`
-	Field8268     *int32                `protobuf:"varint,14,opt,name=field8268" json:"field8268,omitempty"`
-	Field8269     *int32                `protobuf:"varint,15,opt,name=field8269" json:"field8269,omitempty"`
-	Field8270     *int64                `protobuf:"varint,16,opt,name=field8270" json:"field8270,omitempty"`
-	Field8271     *float64              `protobuf:"fixed64,17,opt,name=field8271" json:"field8271,omitempty"`
-	Field8272     *UnusedEmptyMessage   `protobuf:"bytes,18,opt,name=field8272" json:"field8272,omitempty"`
-	Field8273     *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field8273" json:"field8273,omitempty"`
-	Field8274     []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field8274" json:"field8274,omitempty"`
-	Field8275     *bool                 `protobuf:"varint,21,opt,name=field8275" json:"field8275,omitempty"`
-	Field8276     *UnusedEmptyMessage   `protobuf:"bytes,22,opt,name=field8276" json:"field8276,omitempty"`
-	Field8277     *UnusedEmptyMessage   `protobuf:"bytes,23,opt,name=field8277" json:"field8277,omitempty"`
-	Field8278     []*UnusedEmptyMessage `protobuf:"bytes,24,rep,name=field8278" json:"field8278,omitempty"`
-	Field8279     *UnusedEmptyMessage   `protobuf:"bytes,25,opt,name=field8279" json:"field8279,omitempty"`
-	Field8280     *bool                 `protobuf:"varint,26,opt,name=field8280" json:"field8280,omitempty"`
-	Field8281     []*UnusedEmptyMessage `protobuf:"bytes,27,rep,name=field8281" json:"field8281,omitempty"`
+
+	Field8255 *UnusedEmptyMessage   `protobuf:"bytes,1,opt,name=field8255" json:"field8255,omitempty"`
+	Field8256 *Message8184          `protobuf:"bytes,2,opt,name=field8256" json:"field8256,omitempty"`
+	Field8257 *Message7966          `protobuf:"bytes,3,opt,name=field8257" json:"field8257,omitempty"`
+	Field8258 *string               `protobuf:"bytes,4,opt,name=field8258" json:"field8258,omitempty"`
+	Field8259 *string               `protobuf:"bytes,5,opt,name=field8259" json:"field8259,omitempty"`
+	Field8260 *bool                 `protobuf:"varint,6,opt,name=field8260" json:"field8260,omitempty"`
+	Field8261 *int64                `protobuf:"varint,7,opt,name=field8261" json:"field8261,omitempty"`
+	Field8262 *string               `protobuf:"bytes,8,opt,name=field8262" json:"field8262,omitempty"`
+	Field8263 *int64                `protobuf:"varint,9,opt,name=field8263" json:"field8263,omitempty"`
+	Field8264 *float64              `protobuf:"fixed64,10,opt,name=field8264" json:"field8264,omitempty"`
+	Field8265 *int64                `protobuf:"varint,11,opt,name=field8265" json:"field8265,omitempty"`
+	Field8266 []string              `protobuf:"bytes,12,rep,name=field8266" json:"field8266,omitempty"`
+	Field8267 *int64                `protobuf:"varint,13,opt,name=field8267" json:"field8267,omitempty"`
+	Field8268 *int32                `protobuf:"varint,14,opt,name=field8268" json:"field8268,omitempty"`
+	Field8269 *int32                `protobuf:"varint,15,opt,name=field8269" json:"field8269,omitempty"`
+	Field8270 *int64                `protobuf:"varint,16,opt,name=field8270" json:"field8270,omitempty"`
+	Field8271 *float64              `protobuf:"fixed64,17,opt,name=field8271" json:"field8271,omitempty"`
+	Field8272 *UnusedEmptyMessage   `protobuf:"bytes,18,opt,name=field8272" json:"field8272,omitempty"`
+	Field8273 *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field8273" json:"field8273,omitempty"`
+	Field8274 []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field8274" json:"field8274,omitempty"`
+	Field8275 *bool                 `protobuf:"varint,21,opt,name=field8275" json:"field8275,omitempty"`
+	Field8276 *UnusedEmptyMessage   `protobuf:"bytes,22,opt,name=field8276" json:"field8276,omitempty"`
+	Field8277 *UnusedEmptyMessage   `protobuf:"bytes,23,opt,name=field8277" json:"field8277,omitempty"`
+	Field8278 []*UnusedEmptyMessage `protobuf:"bytes,24,rep,name=field8278" json:"field8278,omitempty"`
+	Field8279 *UnusedEmptyMessage   `protobuf:"bytes,25,opt,name=field8279" json:"field8279,omitempty"`
+	Field8280 *bool                 `protobuf:"varint,26,opt,name=field8280" json:"field8280,omitempty"`
+	Field8281 []*UnusedEmptyMessage `protobuf:"bytes,27,rep,name=field8281" json:"field8281,omitempty"`
 }
 
 func (x *Message8224) Reset() {
@@ -1511,15 +1521,16 @@ type Message8392 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8395     *string      `protobuf:"bytes,1,opt,name=field8395" json:"field8395,omitempty"`
-	Field8396     *string      `protobuf:"bytes,2,opt,name=field8396" json:"field8396,omitempty"`
-	Field8397     *Message7966 `protobuf:"bytes,3,opt,name=field8397" json:"field8397,omitempty"`
-	Field8398     *string      `protobuf:"bytes,4,opt,name=field8398" json:"field8398,omitempty"`
-	Field8399     *string      `protobuf:"bytes,5,opt,name=field8399" json:"field8399,omitempty"`
-	Field8400     *string      `protobuf:"bytes,6,opt,name=field8400" json:"field8400,omitempty"`
-	Field8401     *string      `protobuf:"bytes,7,opt,name=field8401" json:"field8401,omitempty"`
-	Field8402     *string      `protobuf:"bytes,8,opt,name=field8402" json:"field8402,omitempty"`
-	Field8403     *string      `protobuf:"bytes,9,opt,name=field8403" json:"field8403,omitempty"`
+
+	Field8395 *string      `protobuf:"bytes,1,opt,name=field8395" json:"field8395,omitempty"`
+	Field8396 *string      `protobuf:"bytes,2,opt,name=field8396" json:"field8396,omitempty"`
+	Field8397 *Message7966 `protobuf:"bytes,3,opt,name=field8397" json:"field8397,omitempty"`
+	Field8398 *string      `protobuf:"bytes,4,opt,name=field8398" json:"field8398,omitempty"`
+	Field8399 *string      `protobuf:"bytes,5,opt,name=field8399" json:"field8399,omitempty"`
+	Field8400 *string      `protobuf:"bytes,6,opt,name=field8400" json:"field8400,omitempty"`
+	Field8401 *string      `protobuf:"bytes,7,opt,name=field8401" json:"field8401,omitempty"`
+	Field8402 *string      `protobuf:"bytes,8,opt,name=field8402" json:"field8402,omitempty"`
+	Field8403 *string      `protobuf:"bytes,9,opt,name=field8403" json:"field8403,omitempty"`
 }
 
 func (x *Message8392) Reset() {
@@ -1616,30 +1627,31 @@ type Message8130 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8156     *string               `protobuf:"bytes,1,opt,name=field8156" json:"field8156,omitempty"`
-	Field8157     *string               `protobuf:"bytes,2,opt,name=field8157" json:"field8157,omitempty"`
-	Field8158     *string               `protobuf:"bytes,4,opt,name=field8158" json:"field8158,omitempty"`
-	Field8159     *UnusedEmptyMessage   `protobuf:"bytes,6,opt,name=field8159" json:"field8159,omitempty"`
-	Field8160     []string              `protobuf:"bytes,7,rep,name=field8160" json:"field8160,omitempty"`
-	Field8161     *int64                `protobuf:"varint,8,opt,name=field8161" json:"field8161,omitempty"`
-	Field8162     *UnusedEmptyMessage   `protobuf:"bytes,9,opt,name=field8162" json:"field8162,omitempty"`
-	Field8163     *string               `protobuf:"bytes,10,opt,name=field8163" json:"field8163,omitempty"`
-	Field8164     *string               `protobuf:"bytes,11,opt,name=field8164" json:"field8164,omitempty"`
-	Field8165     *string               `protobuf:"bytes,12,opt,name=field8165" json:"field8165,omitempty"`
-	Field8166     *string               `protobuf:"bytes,13,opt,name=field8166" json:"field8166,omitempty"`
-	Field8167     *UnusedEmptyMessage   `protobuf:"bytes,14,opt,name=field8167" json:"field8167,omitempty"`
-	Field8168     *UnusedEmptyMessage   `protobuf:"bytes,15,opt,name=field8168" json:"field8168,omitempty"`
-	Field8169     *string               `protobuf:"bytes,16,opt,name=field8169" json:"field8169,omitempty"`
-	Field8170     *UnusedEnum           `protobuf:"varint,17,opt,name=field8170,enum=benchmarks.google_message3.UnusedEnum" json:"field8170,omitempty"`
-	Field8171     *UnusedEnum           `protobuf:"varint,18,opt,name=field8171,enum=benchmarks.google_message3.UnusedEnum" json:"field8171,omitempty"`
-	Field8172     *bool                 `protobuf:"varint,19,opt,name=field8172" json:"field8172,omitempty"`
-	Field8173     *bool                 `protobuf:"varint,20,opt,name=field8173" json:"field8173,omitempty"`
-	Field8174     *float64              `protobuf:"fixed64,21,opt,name=field8174" json:"field8174,omitempty"`
-	Field8175     *int32                `protobuf:"varint,22,opt,name=field8175" json:"field8175,omitempty"`
-	Field8176     *int32                `protobuf:"varint,23,opt,name=field8176" json:"field8176,omitempty"`
-	Field8177     *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field8177" json:"field8177,omitempty"`
-	Field8178     []*UnusedEmptyMessage `protobuf:"bytes,25,rep,name=field8178" json:"field8178,omitempty"`
-	Field8179     []*UnusedEmptyMessage `protobuf:"bytes,26,rep,name=field8179" json:"field8179,omitempty"`
+
+	Field8156 *string               `protobuf:"bytes,1,opt,name=field8156" json:"field8156,omitempty"`
+	Field8157 *string               `protobuf:"bytes,2,opt,name=field8157" json:"field8157,omitempty"`
+	Field8158 *string               `protobuf:"bytes,4,opt,name=field8158" json:"field8158,omitempty"`
+	Field8159 *UnusedEmptyMessage   `protobuf:"bytes,6,opt,name=field8159" json:"field8159,omitempty"`
+	Field8160 []string              `protobuf:"bytes,7,rep,name=field8160" json:"field8160,omitempty"`
+	Field8161 *int64                `protobuf:"varint,8,opt,name=field8161" json:"field8161,omitempty"`
+	Field8162 *UnusedEmptyMessage   `protobuf:"bytes,9,opt,name=field8162" json:"field8162,omitempty"`
+	Field8163 *string               `protobuf:"bytes,10,opt,name=field8163" json:"field8163,omitempty"`
+	Field8164 *string               `protobuf:"bytes,11,opt,name=field8164" json:"field8164,omitempty"`
+	Field8165 *string               `protobuf:"bytes,12,opt,name=field8165" json:"field8165,omitempty"`
+	Field8166 *string               `protobuf:"bytes,13,opt,name=field8166" json:"field8166,omitempty"`
+	Field8167 *UnusedEmptyMessage   `protobuf:"bytes,14,opt,name=field8167" json:"field8167,omitempty"`
+	Field8168 *UnusedEmptyMessage   `protobuf:"bytes,15,opt,name=field8168" json:"field8168,omitempty"`
+	Field8169 *string               `protobuf:"bytes,16,opt,name=field8169" json:"field8169,omitempty"`
+	Field8170 *UnusedEnum           `protobuf:"varint,17,opt,name=field8170,enum=benchmarks.google_message3.UnusedEnum" json:"field8170,omitempty"`
+	Field8171 *UnusedEnum           `protobuf:"varint,18,opt,name=field8171,enum=benchmarks.google_message3.UnusedEnum" json:"field8171,omitempty"`
+	Field8172 *bool                 `protobuf:"varint,19,opt,name=field8172" json:"field8172,omitempty"`
+	Field8173 *bool                 `protobuf:"varint,20,opt,name=field8173" json:"field8173,omitempty"`
+	Field8174 *float64              `protobuf:"fixed64,21,opt,name=field8174" json:"field8174,omitempty"`
+	Field8175 *int32                `protobuf:"varint,22,opt,name=field8175" json:"field8175,omitempty"`
+	Field8176 *int32                `protobuf:"varint,23,opt,name=field8176" json:"field8176,omitempty"`
+	Field8177 *UnusedEmptyMessage   `protobuf:"bytes,24,opt,name=field8177" json:"field8177,omitempty"`
+	Field8178 []*UnusedEmptyMessage `protobuf:"bytes,25,rep,name=field8178" json:"field8178,omitempty"`
+	Field8179 []*UnusedEmptyMessage `protobuf:"bytes,26,rep,name=field8179" json:"field8179,omitempty"`
 }
 
 func (x *Message8130) Reset() {
@@ -1841,14 +1853,15 @@ type Message8478 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8489     *string             `protobuf:"bytes,7,opt,name=field8489" json:"field8489,omitempty"`
-	Field8490     *Message7966        `protobuf:"bytes,1,opt,name=field8490" json:"field8490,omitempty"`
-	Field8491     *Message8476        `protobuf:"bytes,2,opt,name=field8491" json:"field8491,omitempty"`
-	Field8492     *int64              `protobuf:"varint,3,opt,name=field8492" json:"field8492,omitempty"`
-	Field8493     *Message8476        `protobuf:"bytes,4,opt,name=field8493" json:"field8493,omitempty"`
-	Field8494     []*Message8477      `protobuf:"bytes,5,rep,name=field8494" json:"field8494,omitempty"`
-	Field8495     *Message8454        `protobuf:"bytes,6,opt,name=field8495" json:"field8495,omitempty"`
-	Field8496     *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field8496" json:"field8496,omitempty"`
+
+	Field8489 *string             `protobuf:"bytes,7,opt,name=field8489" json:"field8489,omitempty"`
+	Field8490 *Message7966        `protobuf:"bytes,1,opt,name=field8490" json:"field8490,omitempty"`
+	Field8491 *Message8476        `protobuf:"bytes,2,opt,name=field8491" json:"field8491,omitempty"`
+	Field8492 *int64              `protobuf:"varint,3,opt,name=field8492" json:"field8492,omitempty"`
+	Field8493 *Message8476        `protobuf:"bytes,4,opt,name=field8493" json:"field8493,omitempty"`
+	Field8494 []*Message8477      `protobuf:"bytes,5,rep,name=field8494" json:"field8494,omitempty"`
+	Field8495 *Message8454        `protobuf:"bytes,6,opt,name=field8495" json:"field8495,omitempty"`
+	Field8496 *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field8496" json:"field8496,omitempty"`
 }
 
 func (x *Message8478) Reset() {
@@ -1938,15 +1951,16 @@ type Message8479 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8497     *Message8475        `protobuf:"bytes,1,opt,name=field8497" json:"field8497,omitempty"`
-	Field8498     *Message7966        `protobuf:"bytes,2,opt,name=field8498" json:"field8498,omitempty"`
-	Field8499     *Message8476        `protobuf:"bytes,3,opt,name=field8499" json:"field8499,omitempty"`
-	Field8500     *Message8476        `protobuf:"bytes,4,opt,name=field8500" json:"field8500,omitempty"`
-	Field8501     *string             `protobuf:"bytes,6,opt,name=field8501" json:"field8501,omitempty"`
-	Field8502     *string             `protobuf:"bytes,7,opt,name=field8502" json:"field8502,omitempty"`
-	Field8503     *Message7966        `protobuf:"bytes,8,opt,name=field8503" json:"field8503,omitempty"`
-	Field8504     *Message8455        `protobuf:"bytes,5,opt,name=field8504" json:"field8504,omitempty"`
-	Field8505     *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field8505" json:"field8505,omitempty"`
+
+	Field8497 *Message8475        `protobuf:"bytes,1,opt,name=field8497" json:"field8497,omitempty"`
+	Field8498 *Message7966        `protobuf:"bytes,2,opt,name=field8498" json:"field8498,omitempty"`
+	Field8499 *Message8476        `protobuf:"bytes,3,opt,name=field8499" json:"field8499,omitempty"`
+	Field8500 *Message8476        `protobuf:"bytes,4,opt,name=field8500" json:"field8500,omitempty"`
+	Field8501 *string             `protobuf:"bytes,6,opt,name=field8501" json:"field8501,omitempty"`
+	Field8502 *string             `protobuf:"bytes,7,opt,name=field8502" json:"field8502,omitempty"`
+	Field8503 *Message7966        `protobuf:"bytes,8,opt,name=field8503" json:"field8503,omitempty"`
+	Field8504 *Message8455        `protobuf:"bytes,5,opt,name=field8504" json:"field8504,omitempty"`
+	Field8505 *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field8505" json:"field8505,omitempty"`
 }
 
 func (x *Message8479) Reset() {
@@ -2043,13 +2057,14 @@ type Message10319 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10340    *Enum10325 `protobuf:"varint,1,opt,name=field10340,enum=benchmarks.google_message3.Enum10325" json:"field10340,omitempty"`
-	Field10341    *int32     `protobuf:"varint,4,opt,name=field10341" json:"field10341,omitempty"`
-	Field10342    *int32     `protobuf:"varint,5,opt,name=field10342" json:"field10342,omitempty"`
-	Field10343    []byte     `protobuf:"bytes,3,opt,name=field10343" json:"field10343,omitempty"`
-	Field10344    *string    `protobuf:"bytes,2,opt,name=field10344" json:"field10344,omitempty"`
-	Field10345    *string    `protobuf:"bytes,6,opt,name=field10345" json:"field10345,omitempty"`
-	Field10346    *string    `protobuf:"bytes,7,opt,name=field10346" json:"field10346,omitempty"`
+
+	Field10340 *Enum10325 `protobuf:"varint,1,opt,name=field10340,enum=benchmarks.google_message3.Enum10325" json:"field10340,omitempty"`
+	Field10341 *int32     `protobuf:"varint,4,opt,name=field10341" json:"field10341,omitempty"`
+	Field10342 *int32     `protobuf:"varint,5,opt,name=field10342" json:"field10342,omitempty"`
+	Field10343 []byte     `protobuf:"bytes,3,opt,name=field10343" json:"field10343,omitempty"`
+	Field10344 *string    `protobuf:"bytes,2,opt,name=field10344" json:"field10344,omitempty"`
+	Field10345 *string    `protobuf:"bytes,6,opt,name=field10345" json:"field10345,omitempty"`
+	Field10346 *string    `protobuf:"bytes,7,opt,name=field10346" json:"field10346,omitempty"`
 }
 
 func (x *Message10319) Reset() {
@@ -2132,10 +2147,11 @@ type Message4016 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field4017     *int32 `protobuf:"varint,1,req,name=field4017" json:"field4017,omitempty"`
-	Field4018     *int32 `protobuf:"varint,2,req,name=field4018" json:"field4018,omitempty"`
-	Field4019     *int32 `protobuf:"varint,3,req,name=field4019" json:"field4019,omitempty"`
-	Field4020     *int32 `protobuf:"varint,4,req,name=field4020" json:"field4020,omitempty"`
+
+	Field4017 *int32 `protobuf:"varint,1,req,name=field4017" json:"field4017,omitempty"`
+	Field4018 *int32 `protobuf:"varint,2,req,name=field4018" json:"field4018,omitempty"`
+	Field4019 *int32 `protobuf:"varint,3,req,name=field4019" json:"field4019,omitempty"`
+	Field4020 *int32 `protobuf:"varint,4,req,name=field4020" json:"field4020,omitempty"`
 }
 
 func (x *Message4016) Reset() {
@@ -2197,10 +2213,11 @@ type Message12669 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12681    *Message12559 `protobuf:"bytes,1,opt,name=field12681" json:"field12681,omitempty"`
-	Field12682    *float32      `protobuf:"fixed32,2,opt,name=field12682" json:"field12682,omitempty"`
-	Field12683    *bool         `protobuf:"varint,3,opt,name=field12683" json:"field12683,omitempty"`
-	Field12684    *Enum12670    `protobuf:"varint,4,opt,name=field12684,enum=benchmarks.google_message3.Enum12670" json:"field12684,omitempty"`
+
+	Field12681 *Message12559 `protobuf:"bytes,1,opt,name=field12681" json:"field12681,omitempty"`
+	Field12682 *float32      `protobuf:"fixed32,2,opt,name=field12682" json:"field12682,omitempty"`
+	Field12683 *bool         `protobuf:"varint,3,opt,name=field12683" json:"field12683,omitempty"`
+	Field12684 *Enum12670    `protobuf:"varint,4,opt,name=field12684,enum=benchmarks.google_message3.Enum12670" json:"field12684,omitempty"`
 }
 
 func (x *Message12669) Reset() {
@@ -2262,12 +2279,13 @@ type Message12819 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12834    *float64 `protobuf:"fixed64,1,opt,name=field12834" json:"field12834,omitempty"`
-	Field12835    *float64 `protobuf:"fixed64,2,opt,name=field12835" json:"field12835,omitempty"`
-	Field12836    *float64 `protobuf:"fixed64,3,opt,name=field12836" json:"field12836,omitempty"`
-	Field12837    *float64 `protobuf:"fixed64,4,opt,name=field12837" json:"field12837,omitempty"`
-	Field12838    *float64 `protobuf:"fixed64,5,opt,name=field12838" json:"field12838,omitempty"`
-	Field12839    *float64 `protobuf:"fixed64,6,opt,name=field12839" json:"field12839,omitempty"`
+
+	Field12834 *float64 `protobuf:"fixed64,1,opt,name=field12834" json:"field12834,omitempty"`
+	Field12835 *float64 `protobuf:"fixed64,2,opt,name=field12835" json:"field12835,omitempty"`
+	Field12836 *float64 `protobuf:"fixed64,3,opt,name=field12836" json:"field12836,omitempty"`
+	Field12837 *float64 `protobuf:"fixed64,4,opt,name=field12837" json:"field12837,omitempty"`
+	Field12838 *float64 `protobuf:"fixed64,5,opt,name=field12838" json:"field12838,omitempty"`
+	Field12839 *float64 `protobuf:"fixed64,6,opt,name=field12839" json:"field12839,omitempty"`
 }
 
 func (x *Message12819) Reset() {
@@ -2343,14 +2361,15 @@ type Message12820 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12840    *int32 `protobuf:"varint,1,opt,name=field12840" json:"field12840,omitempty"`
-	Field12841    *int32 `protobuf:"varint,2,opt,name=field12841" json:"field12841,omitempty"`
-	Field12842    *int32 `protobuf:"varint,3,opt,name=field12842" json:"field12842,omitempty"`
-	Field12843    *int32 `protobuf:"varint,8,opt,name=field12843" json:"field12843,omitempty"`
-	Field12844    *int32 `protobuf:"varint,4,opt,name=field12844" json:"field12844,omitempty"`
-	Field12845    *int32 `protobuf:"varint,5,opt,name=field12845" json:"field12845,omitempty"`
-	Field12846    *int32 `protobuf:"varint,6,opt,name=field12846" json:"field12846,omitempty"`
-	Field12847    *int32 `protobuf:"varint,7,opt,name=field12847" json:"field12847,omitempty"`
+
+	Field12840 *int32 `protobuf:"varint,1,opt,name=field12840" json:"field12840,omitempty"`
+	Field12841 *int32 `protobuf:"varint,2,opt,name=field12841" json:"field12841,omitempty"`
+	Field12842 *int32 `protobuf:"varint,3,opt,name=field12842" json:"field12842,omitempty"`
+	Field12843 *int32 `protobuf:"varint,8,opt,name=field12843" json:"field12843,omitempty"`
+	Field12844 *int32 `protobuf:"varint,4,opt,name=field12844" json:"field12844,omitempty"`
+	Field12845 *int32 `protobuf:"varint,5,opt,name=field12845" json:"field12845,omitempty"`
+	Field12846 *int32 `protobuf:"varint,6,opt,name=field12846" json:"field12846,omitempty"`
+	Field12847 *int32 `protobuf:"varint,7,opt,name=field12847" json:"field12847,omitempty"`
 }
 
 func (x *Message12820) Reset() {
@@ -2440,11 +2459,12 @@ type Message12821 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12848    *int32 `protobuf:"varint,1,opt,name=field12848" json:"field12848,omitempty"`
-	Field12849    *int32 `protobuf:"varint,2,opt,name=field12849" json:"field12849,omitempty"`
-	Field12850    *int32 `protobuf:"varint,3,opt,name=field12850" json:"field12850,omitempty"`
-	Field12851    *int32 `protobuf:"varint,4,opt,name=field12851" json:"field12851,omitempty"`
-	Field12852    *int32 `protobuf:"varint,5,opt,name=field12852" json:"field12852,omitempty"`
+
+	Field12848 *int32 `protobuf:"varint,1,opt,name=field12848" json:"field12848,omitempty"`
+	Field12849 *int32 `protobuf:"varint,2,opt,name=field12849" json:"field12849,omitempty"`
+	Field12850 *int32 `protobuf:"varint,3,opt,name=field12850" json:"field12850,omitempty"`
+	Field12851 *int32 `protobuf:"varint,4,opt,name=field12851" json:"field12851,omitempty"`
+	Field12852 *int32 `protobuf:"varint,5,opt,name=field12852" json:"field12852,omitempty"`
 }
 
 func (x *Message12821) Reset() {
@@ -2513,11 +2533,12 @@ type Message12818 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12829    *uint64         `protobuf:"varint,1,opt,name=field12829" json:"field12829,omitempty"`
-	Field12830    *int32          `protobuf:"varint,2,opt,name=field12830" json:"field12830,omitempty"`
-	Field12831    *int32          `protobuf:"varint,3,opt,name=field12831" json:"field12831,omitempty"`
-	Field12832    *int32          `protobuf:"varint,5,opt,name=field12832" json:"field12832,omitempty"`
-	Field12833    []*Message12817 `protobuf:"bytes,4,rep,name=field12833" json:"field12833,omitempty"`
+
+	Field12829 *uint64         `protobuf:"varint,1,opt,name=field12829" json:"field12829,omitempty"`
+	Field12830 *int32          `protobuf:"varint,2,opt,name=field12830" json:"field12830,omitempty"`
+	Field12831 *int32          `protobuf:"varint,3,opt,name=field12831" json:"field12831,omitempty"`
+	Field12832 *int32          `protobuf:"varint,5,opt,name=field12832" json:"field12832,omitempty"`
+	Field12833 []*Message12817 `protobuf:"bytes,4,rep,name=field12833" json:"field12833,omitempty"`
 }
 
 func (x *Message12818) Reset() {
@@ -2586,12 +2607,13 @@ type Message16479 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16484    *Message16480 `protobuf:"bytes,1,opt,name=field16484" json:"field16484,omitempty"`
-	Field16485    *int32        `protobuf:"varint,5,opt,name=field16485" json:"field16485,omitempty"`
-	Field16486    *float32      `protobuf:"fixed32,2,opt,name=field16486" json:"field16486,omitempty"`
-	Field16487    *uint32       `protobuf:"varint,4,opt,name=field16487" json:"field16487,omitempty"`
-	Field16488    *bool         `protobuf:"varint,3,opt,name=field16488" json:"field16488,omitempty"`
-	Field16489    *uint32       `protobuf:"varint,6,opt,name=field16489" json:"field16489,omitempty"`
+
+	Field16484 *Message16480 `protobuf:"bytes,1,opt,name=field16484" json:"field16484,omitempty"`
+	Field16485 *int32        `protobuf:"varint,5,opt,name=field16485" json:"field16485,omitempty"`
+	Field16486 *float32      `protobuf:"fixed32,2,opt,name=field16486" json:"field16486,omitempty"`
+	Field16487 *uint32       `protobuf:"varint,4,opt,name=field16487" json:"field16487,omitempty"`
+	Field16488 *bool         `protobuf:"varint,3,opt,name=field16488" json:"field16488,omitempty"`
+	Field16489 *uint32       `protobuf:"varint,6,opt,name=field16489" json:"field16489,omitempty"`
 }
 
 func (x *Message16479) Reset() {
@@ -2667,11 +2689,12 @@ type Message16722 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16752    *string `protobuf:"bytes,1,opt,name=field16752" json:"field16752,omitempty"`
-	Field16753    *string `protobuf:"bytes,2,opt,name=field16753" json:"field16753,omitempty"`
-	Field16754    *string `protobuf:"bytes,3,opt,name=field16754" json:"field16754,omitempty"`
-	Field16755    *int32  `protobuf:"varint,5,opt,name=field16755" json:"field16755,omitempty"`
-	Field16756    *string `protobuf:"bytes,4,opt,name=field16756" json:"field16756,omitempty"`
+
+	Field16752 *string `protobuf:"bytes,1,opt,name=field16752" json:"field16752,omitempty"`
+	Field16753 *string `protobuf:"bytes,2,opt,name=field16753" json:"field16753,omitempty"`
+	Field16754 *string `protobuf:"bytes,3,opt,name=field16754" json:"field16754,omitempty"`
+	Field16755 *int32  `protobuf:"varint,5,opt,name=field16755" json:"field16755,omitempty"`
+	Field16756 *string `protobuf:"bytes,4,opt,name=field16756" json:"field16756,omitempty"`
 }
 
 func (x *Message16722) Reset() {
@@ -2740,19 +2763,20 @@ type Message16724 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16761    *int64              `protobuf:"varint,1,opt,name=field16761" json:"field16761,omitempty"`
-	Field16762    *float32            `protobuf:"fixed32,2,opt,name=field16762" json:"field16762,omitempty"`
-	Field16763    *int64              `protobuf:"varint,3,opt,name=field16763" json:"field16763,omitempty"`
-	Field16764    *int64              `protobuf:"varint,4,opt,name=field16764" json:"field16764,omitempty"`
-	Field16765    *bool               `protobuf:"varint,5,opt,name=field16765" json:"field16765,omitempty"`
-	Field16766    []string            `protobuf:"bytes,6,rep,name=field16766" json:"field16766,omitempty"`
-	Field16767    []string            `protobuf:"bytes,7,rep,name=field16767" json:"field16767,omitempty"`
-	Field16768    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field16768" json:"field16768,omitempty"`
-	Field16769    *bool               `protobuf:"varint,9,opt,name=field16769" json:"field16769,omitempty"`
-	Field16770    *uint32             `protobuf:"varint,10,opt,name=field16770" json:"field16770,omitempty"`
-	Field16771    *Enum16728          `protobuf:"varint,11,opt,name=field16771,enum=benchmarks.google_message3.Enum16728" json:"field16771,omitempty"`
-	Field16772    []int32             `protobuf:"varint,12,rep,name=field16772" json:"field16772,omitempty"`
-	Field16773    *bool               `protobuf:"varint,13,opt,name=field16773" json:"field16773,omitempty"`
+
+	Field16761 *int64              `protobuf:"varint,1,opt,name=field16761" json:"field16761,omitempty"`
+	Field16762 *float32            `protobuf:"fixed32,2,opt,name=field16762" json:"field16762,omitempty"`
+	Field16763 *int64              `protobuf:"varint,3,opt,name=field16763" json:"field16763,omitempty"`
+	Field16764 *int64              `protobuf:"varint,4,opt,name=field16764" json:"field16764,omitempty"`
+	Field16765 *bool               `protobuf:"varint,5,opt,name=field16765" json:"field16765,omitempty"`
+	Field16766 []string            `protobuf:"bytes,6,rep,name=field16766" json:"field16766,omitempty"`
+	Field16767 []string            `protobuf:"bytes,7,rep,name=field16767" json:"field16767,omitempty"`
+	Field16768 *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field16768" json:"field16768,omitempty"`
+	Field16769 *bool               `protobuf:"varint,9,opt,name=field16769" json:"field16769,omitempty"`
+	Field16770 *uint32             `protobuf:"varint,10,opt,name=field16770" json:"field16770,omitempty"`
+	Field16771 *Enum16728          `protobuf:"varint,11,opt,name=field16771,enum=benchmarks.google_message3.Enum16728" json:"field16771,omitempty"`
+	Field16772 []int32             `protobuf:"varint,12,rep,name=field16772" json:"field16772,omitempty"`
+	Field16773 *bool               `protobuf:"varint,13,opt,name=field16773" json:"field16773,omitempty"`
 }
 
 func (x *Message16724) Reset() {
@@ -2910,21 +2934,22 @@ type Message24356 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24559    *string               `protobuf:"bytes,1,opt,name=field24559" json:"field24559,omitempty"`
-	Field24560    *string               `protobuf:"bytes,2,opt,name=field24560" json:"field24560,omitempty"`
-	Field24561    *int32                `protobuf:"varint,14,opt,name=field24561" json:"field24561,omitempty"`
-	Field24562    *string               `protobuf:"bytes,3,opt,name=field24562" json:"field24562,omitempty"`
-	Field24563    *string               `protobuf:"bytes,4,opt,name=field24563" json:"field24563,omitempty"`
-	Field24564    *string               `protobuf:"bytes,5,opt,name=field24564" json:"field24564,omitempty"`
-	Field24565    *UnusedEnum           `protobuf:"varint,13,opt,name=field24565,enum=benchmarks.google_message3.UnusedEnum" json:"field24565,omitempty"`
-	Field24566    *string               `protobuf:"bytes,6,opt,name=field24566" json:"field24566,omitempty"`
-	Field24567    *Enum24361            `protobuf:"varint,12,opt,name=field24567,enum=benchmarks.google_message3.Enum24361" json:"field24567,omitempty"`
-	Field24568    *string               `protobuf:"bytes,7,opt,name=field24568" json:"field24568,omitempty"`
-	Field24569    *string               `protobuf:"bytes,8,opt,name=field24569" json:"field24569,omitempty"`
-	Field24570    *string               `protobuf:"bytes,9,opt,name=field24570" json:"field24570,omitempty"`
-	Field24571    []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field24571" json:"field24571,omitempty"`
-	Field24572    []string              `protobuf:"bytes,11,rep,name=field24572" json:"field24572,omitempty"`
-	Field24573    []string              `protobuf:"bytes,15,rep,name=field24573" json:"field24573,omitempty"`
+
+	Field24559 *string               `protobuf:"bytes,1,opt,name=field24559" json:"field24559,omitempty"`
+	Field24560 *string               `protobuf:"bytes,2,opt,name=field24560" json:"field24560,omitempty"`
+	Field24561 *int32                `protobuf:"varint,14,opt,name=field24561" json:"field24561,omitempty"`
+	Field24562 *string               `protobuf:"bytes,3,opt,name=field24562" json:"field24562,omitempty"`
+	Field24563 *string               `protobuf:"bytes,4,opt,name=field24563" json:"field24563,omitempty"`
+	Field24564 *string               `protobuf:"bytes,5,opt,name=field24564" json:"field24564,omitempty"`
+	Field24565 *UnusedEnum           `protobuf:"varint,13,opt,name=field24565,enum=benchmarks.google_message3.UnusedEnum" json:"field24565,omitempty"`
+	Field24566 *string               `protobuf:"bytes,6,opt,name=field24566" json:"field24566,omitempty"`
+	Field24567 *Enum24361            `protobuf:"varint,12,opt,name=field24567,enum=benchmarks.google_message3.Enum24361" json:"field24567,omitempty"`
+	Field24568 *string               `protobuf:"bytes,7,opt,name=field24568" json:"field24568,omitempty"`
+	Field24569 *string               `protobuf:"bytes,8,opt,name=field24569" json:"field24569,omitempty"`
+	Field24570 *string               `protobuf:"bytes,9,opt,name=field24570" json:"field24570,omitempty"`
+	Field24571 []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field24571" json:"field24571,omitempty"`
+	Field24572 []string              `protobuf:"bytes,11,rep,name=field24572" json:"field24572,omitempty"`
+	Field24573 []string              `protobuf:"bytes,15,rep,name=field24573" json:"field24573,omitempty"`
 }
 
 func (x *Message24356) Reset() {
@@ -3063,20 +3088,21 @@ type Message24376 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24589    *string               `protobuf:"bytes,1,opt,name=field24589" json:"field24589,omitempty"`
-	Field24590    *string               `protobuf:"bytes,2,opt,name=field24590" json:"field24590,omitempty"`
-	Field24591    *string               `protobuf:"bytes,3,opt,name=field24591" json:"field24591,omitempty"`
-	Field24592    *Message24377         `protobuf:"bytes,4,req,name=field24592" json:"field24592,omitempty"`
-	Field24593    *Message24317         `protobuf:"bytes,5,opt,name=field24593" json:"field24593,omitempty"`
-	Field24594    *string               `protobuf:"bytes,6,opt,name=field24594" json:"field24594,omitempty"`
-	Field24595    *Message24378         `protobuf:"bytes,7,opt,name=field24595" json:"field24595,omitempty"`
-	Field24596    []string              `protobuf:"bytes,8,rep,name=field24596" json:"field24596,omitempty"`
-	Field24597    []*UnusedEmptyMessage `protobuf:"bytes,14,rep,name=field24597" json:"field24597,omitempty"`
-	Field24598    []string              `protobuf:"bytes,9,rep,name=field24598" json:"field24598,omitempty"`
-	Field24599    []string              `protobuf:"bytes,10,rep,name=field24599" json:"field24599,omitempty"`
-	Field24600    []string              `protobuf:"bytes,11,rep,name=field24600" json:"field24600,omitempty"`
-	Field24601    *string               `protobuf:"bytes,12,opt,name=field24601" json:"field24601,omitempty"`
-	Field24602    []string              `protobuf:"bytes,13,rep,name=field24602" json:"field24602,omitempty"`
+
+	Field24589 *string               `protobuf:"bytes,1,opt,name=field24589" json:"field24589,omitempty"`
+	Field24590 *string               `protobuf:"bytes,2,opt,name=field24590" json:"field24590,omitempty"`
+	Field24591 *string               `protobuf:"bytes,3,opt,name=field24591" json:"field24591,omitempty"`
+	Field24592 *Message24377         `protobuf:"bytes,4,req,name=field24592" json:"field24592,omitempty"`
+	Field24593 *Message24317         `protobuf:"bytes,5,opt,name=field24593" json:"field24593,omitempty"`
+	Field24594 *string               `protobuf:"bytes,6,opt,name=field24594" json:"field24594,omitempty"`
+	Field24595 *Message24378         `protobuf:"bytes,7,opt,name=field24595" json:"field24595,omitempty"`
+	Field24596 []string              `protobuf:"bytes,8,rep,name=field24596" json:"field24596,omitempty"`
+	Field24597 []*UnusedEmptyMessage `protobuf:"bytes,14,rep,name=field24597" json:"field24597,omitempty"`
+	Field24598 []string              `protobuf:"bytes,9,rep,name=field24598" json:"field24598,omitempty"`
+	Field24599 []string              `protobuf:"bytes,10,rep,name=field24599" json:"field24599,omitempty"`
+	Field24600 []string              `protobuf:"bytes,11,rep,name=field24600" json:"field24600,omitempty"`
+	Field24601 *string               `protobuf:"bytes,12,opt,name=field24601" json:"field24601,omitempty"`
+	Field24602 []string              `protobuf:"bytes,13,rep,name=field24602" json:"field24602,omitempty"`
 }
 
 func (x *Message24376) Reset() {
@@ -3208,21 +3234,22 @@ type Message24366 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24574    *string               `protobuf:"bytes,1,opt,name=field24574" json:"field24574,omitempty"`
-	Field24575    *string               `protobuf:"bytes,2,opt,name=field24575" json:"field24575,omitempty"`
-	Field24576    *string               `protobuf:"bytes,3,opt,name=field24576" json:"field24576,omitempty"`
-	Field24577    *int32                `protobuf:"varint,10,opt,name=field24577" json:"field24577,omitempty"`
-	Field24578    *string               `protobuf:"bytes,13,opt,name=field24578" json:"field24578,omitempty"`
-	Field24579    *string               `protobuf:"bytes,4,opt,name=field24579" json:"field24579,omitempty"`
-	Field24580    *string               `protobuf:"bytes,5,opt,name=field24580" json:"field24580,omitempty"`
-	Field24581    *UnusedEnum           `protobuf:"varint,9,opt,name=field24581,enum=benchmarks.google_message3.UnusedEnum" json:"field24581,omitempty"`
-	Field24582    *string               `protobuf:"bytes,14,opt,name=field24582" json:"field24582,omitempty"`
-	Field24583    *UnusedEnum           `protobuf:"varint,15,opt,name=field24583,enum=benchmarks.google_message3.UnusedEnum" json:"field24583,omitempty"`
-	Field24584    *string               `protobuf:"bytes,6,opt,name=field24584" json:"field24584,omitempty"`
-	Field24585    *string               `protobuf:"bytes,12,opt,name=field24585" json:"field24585,omitempty"`
-	Field24586    []*UnusedEmptyMessage `protobuf:"bytes,7,rep,name=field24586" json:"field24586,omitempty"`
-	Field24587    []string              `protobuf:"bytes,8,rep,name=field24587" json:"field24587,omitempty"`
-	Field24588    []string              `protobuf:"bytes,11,rep,name=field24588" json:"field24588,omitempty"`
+
+	Field24574 *string               `protobuf:"bytes,1,opt,name=field24574" json:"field24574,omitempty"`
+	Field24575 *string               `protobuf:"bytes,2,opt,name=field24575" json:"field24575,omitempty"`
+	Field24576 *string               `protobuf:"bytes,3,opt,name=field24576" json:"field24576,omitempty"`
+	Field24577 *int32                `protobuf:"varint,10,opt,name=field24577" json:"field24577,omitempty"`
+	Field24578 *string               `protobuf:"bytes,13,opt,name=field24578" json:"field24578,omitempty"`
+	Field24579 *string               `protobuf:"bytes,4,opt,name=field24579" json:"field24579,omitempty"`
+	Field24580 *string               `protobuf:"bytes,5,opt,name=field24580" json:"field24580,omitempty"`
+	Field24581 *UnusedEnum           `protobuf:"varint,9,opt,name=field24581,enum=benchmarks.google_message3.UnusedEnum" json:"field24581,omitempty"`
+	Field24582 *string               `protobuf:"bytes,14,opt,name=field24582" json:"field24582,omitempty"`
+	Field24583 *UnusedEnum           `protobuf:"varint,15,opt,name=field24583,enum=benchmarks.google_message3.UnusedEnum" json:"field24583,omitempty"`
+	Field24584 *string               `protobuf:"bytes,6,opt,name=field24584" json:"field24584,omitempty"`
+	Field24585 *string               `protobuf:"bytes,12,opt,name=field24585" json:"field24585,omitempty"`
+	Field24586 []*UnusedEmptyMessage `protobuf:"bytes,7,rep,name=field24586" json:"field24586,omitempty"`
+	Field24587 []string              `protobuf:"bytes,8,rep,name=field24587" json:"field24587,omitempty"`
+	Field24588 []string              `protobuf:"bytes,11,rep,name=field24588" json:"field24588,omitempty"`
 }
 
 func (x *Message24366) Reset() {
@@ -3361,8 +3388,9 @@ type Message35546_Message35547 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field35569    *int32 `protobuf:"varint,5,req,name=field35569" json:"field35569,omitempty"`
-	Field35570    *int32 `protobuf:"varint,6,req,name=field35570" json:"field35570,omitempty"`
+
+	Field35569 *int32 `protobuf:"varint,5,req,name=field35569" json:"field35569,omitempty"`
+	Field35570 *int32 `protobuf:"varint,6,req,name=field35570" json:"field35570,omitempty"`
 }
 
 func (x *Message35546_Message35547) Reset() {
@@ -3410,8 +3438,9 @@ type Message35546_Message35548 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field35571    *int64 `protobuf:"varint,11,req,name=field35571" json:"field35571,omitempty"`
-	Field35572    *int64 `protobuf:"varint,12,req,name=field35572" json:"field35572,omitempty"`
+
+	Field35571 *int64 `protobuf:"varint,11,req,name=field35571" json:"field35571,omitempty"`
+	Field35572 *int64 `protobuf:"varint,12,req,name=field35572" json:"field35572,omitempty"`
 }
 
 func (x *Message35546_Message35548) Reset() {
@@ -3459,18 +3488,19 @@ type Message2356_Message2357 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field2399     *int64 `protobuf:"varint,9,opt,name=field2399" json:"field2399,omitempty"`
-	Field2400     *int32 `protobuf:"varint,10,opt,name=field2400" json:"field2400,omitempty"`
-	Field2401     *int32 `protobuf:"varint,11,opt,name=field2401" json:"field2401,omitempty"`
-	Field2402     *int32 `protobuf:"varint,12,opt,name=field2402" json:"field2402,omitempty"`
-	Field2403     *int32 `protobuf:"varint,13,opt,name=field2403" json:"field2403,omitempty"`
-	Field2404     *int32 `protobuf:"varint,116,opt,name=field2404" json:"field2404,omitempty"`
-	Field2405     *int32 `protobuf:"varint,106,opt,name=field2405" json:"field2405,omitempty"`
-	Field2406     []byte `protobuf:"bytes,14,req,name=field2406" json:"field2406,omitempty"`
-	Field2407     *int32 `protobuf:"varint,45,opt,name=field2407" json:"field2407,omitempty"`
-	Field2408     *int32 `protobuf:"varint,112,opt,name=field2408" json:"field2408,omitempty"`
-	Field2409     *bool  `protobuf:"varint,122,opt,name=field2409" json:"field2409,omitempty"`
-	Field2410     []byte `protobuf:"bytes,124,opt,name=field2410" json:"field2410,omitempty"`
+
+	Field2399 *int64 `protobuf:"varint,9,opt,name=field2399" json:"field2399,omitempty"`
+	Field2400 *int32 `protobuf:"varint,10,opt,name=field2400" json:"field2400,omitempty"`
+	Field2401 *int32 `protobuf:"varint,11,opt,name=field2401" json:"field2401,omitempty"`
+	Field2402 *int32 `protobuf:"varint,12,opt,name=field2402" json:"field2402,omitempty"`
+	Field2403 *int32 `protobuf:"varint,13,opt,name=field2403" json:"field2403,omitempty"`
+	Field2404 *int32 `protobuf:"varint,116,opt,name=field2404" json:"field2404,omitempty"`
+	Field2405 *int32 `protobuf:"varint,106,opt,name=field2405" json:"field2405,omitempty"`
+	Field2406 []byte `protobuf:"bytes,14,req,name=field2406" json:"field2406,omitempty"`
+	Field2407 *int32 `protobuf:"varint,45,opt,name=field2407" json:"field2407,omitempty"`
+	Field2408 *int32 `protobuf:"varint,112,opt,name=field2408" json:"field2408,omitempty"`
+	Field2409 *bool  `protobuf:"varint,122,opt,name=field2409" json:"field2409,omitempty"`
+	Field2410 []byte `protobuf:"bytes,124,opt,name=field2410" json:"field2410,omitempty"`
 }
 
 func (x *Message2356_Message2357) Reset() {
@@ -3621,14 +3651,15 @@ type Message2356_Message2359 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field2413     *string  `protobuf:"bytes,41,opt,name=field2413" json:"field2413,omitempty"`
-	Field2414     *string  `protobuf:"bytes,42,opt,name=field2414" json:"field2414,omitempty"`
-	Field2415     *string  `protobuf:"bytes,43,opt,name=field2415" json:"field2415,omitempty"`
-	Field2416     *string  `protobuf:"bytes,44,opt,name=field2416" json:"field2416,omitempty"`
-	Field2417     *int32   `protobuf:"varint,46,opt,name=field2417" json:"field2417,omitempty"`
-	Field2418     *string  `protobuf:"bytes,47,opt,name=field2418" json:"field2418,omitempty"`
-	Field2419     *float32 `protobuf:"fixed32,110,opt,name=field2419" json:"field2419,omitempty"`
-	Field2420     *float32 `protobuf:"fixed32,111,opt,name=field2420" json:"field2420,omitempty"`
+
+	Field2413 *string  `protobuf:"bytes,41,opt,name=field2413" json:"field2413,omitempty"`
+	Field2414 *string  `protobuf:"bytes,42,opt,name=field2414" json:"field2414,omitempty"`
+	Field2415 *string  `protobuf:"bytes,43,opt,name=field2415" json:"field2415,omitempty"`
+	Field2416 *string  `protobuf:"bytes,44,opt,name=field2416" json:"field2416,omitempty"`
+	Field2417 *int32   `protobuf:"varint,46,opt,name=field2417" json:"field2417,omitempty"`
+	Field2418 *string  `protobuf:"bytes,47,opt,name=field2418" json:"field2418,omitempty"`
+	Field2419 *float32 `protobuf:"fixed32,110,opt,name=field2419" json:"field2419,omitempty"`
+	Field2420 *float32 `protobuf:"fixed32,111,opt,name=field2420" json:"field2420,omitempty"`
 }
 
 func (x *Message2356_Message2359) Reset() {
@@ -3718,9 +3749,10 @@ type Message7029_Message7030 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7226     *string `protobuf:"bytes,14,opt,name=field7226" json:"field7226,omitempty"`
-	Field7227     *string `protobuf:"bytes,15,opt,name=field7227" json:"field7227,omitempty"`
-	Field7228     *int64  `protobuf:"varint,16,opt,name=field7228" json:"field7228,omitempty"`
+
+	Field7226 *string `protobuf:"bytes,14,opt,name=field7226" json:"field7226,omitempty"`
+	Field7227 *string `protobuf:"bytes,15,opt,name=field7227" json:"field7227,omitempty"`
+	Field7228 *int64  `protobuf:"varint,16,opt,name=field7228" json:"field7228,omitempty"`
 }
 
 func (x *Message7029_Message7030) Reset() {
@@ -3775,12 +3807,13 @@ type Message7029_Message7031 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7229     *string `protobuf:"bytes,22,opt,name=field7229" json:"field7229,omitempty"`
-	Field7230     *int32  `protobuf:"varint,23,opt,name=field7230" json:"field7230,omitempty"`
-	Field7231     *int32  `protobuf:"varint,24,opt,name=field7231" json:"field7231,omitempty"`
-	Field7232     *int32  `protobuf:"varint,30,opt,name=field7232" json:"field7232,omitempty"`
-	Field7233     *int32  `protobuf:"varint,31,opt,name=field7233" json:"field7233,omitempty"`
-	Field7234     *int32  `protobuf:"varint,35,opt,name=field7234" json:"field7234,omitempty"`
+
+	Field7229 *string `protobuf:"bytes,22,opt,name=field7229" json:"field7229,omitempty"`
+	Field7230 *int32  `protobuf:"varint,23,opt,name=field7230" json:"field7230,omitempty"`
+	Field7231 *int32  `protobuf:"varint,24,opt,name=field7231" json:"field7231,omitempty"`
+	Field7232 *int32  `protobuf:"varint,30,opt,name=field7232" json:"field7232,omitempty"`
+	Field7233 *int32  `protobuf:"varint,31,opt,name=field7233" json:"field7233,omitempty"`
+	Field7234 *int32  `protobuf:"varint,35,opt,name=field7234" json:"field7234,omitempty"`
 }
 
 func (x *Message7029_Message7031) Reset() {
@@ -3856,29 +3889,30 @@ type Message18921_Message18922 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field18959    *uint64             `protobuf:"varint,6,opt,name=field18959" json:"field18959,omitempty"`
-	Field18960    *string             `protobuf:"bytes,13,opt,name=field18960" json:"field18960,omitempty"`
-	Field18961    *bool               `protobuf:"varint,21,opt,name=field18961" json:"field18961,omitempty"`
-	Field18962    *bool               `protobuf:"varint,33,opt,name=field18962" json:"field18962,omitempty"`
-	Field18963    *int32              `protobuf:"varint,7,opt,name=field18963" json:"field18963,omitempty"`
-	Field18964    *int32              `protobuf:"varint,8,opt,name=field18964" json:"field18964,omitempty"`
-	Field18965    *string             `protobuf:"bytes,9,opt,name=field18965" json:"field18965,omitempty"`
-	Field18966    *Message18856       `protobuf:"bytes,10,opt,name=field18966" json:"field18966,omitempty"`
-	Field18967    *uint64             `protobuf:"varint,34,opt,name=field18967" json:"field18967,omitempty"`
-	Field18968    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field18968" json:"field18968,omitempty"`
-	Field18969    *uint64             `protobuf:"varint,35,opt,name=field18969" json:"field18969,omitempty"`
-	Field18970    *float32            `protobuf:"fixed32,12,opt,name=field18970" json:"field18970,omitempty"`
-	Field18971    []string            `protobuf:"bytes,14,rep,name=field18971" json:"field18971,omitempty"`
-	Field18972    *bool               `protobuf:"varint,15,opt,name=field18972" json:"field18972,omitempty"`
-	Field18973    *bool               `protobuf:"varint,16,opt,name=field18973" json:"field18973,omitempty"`
-	Field18974    *float32            `protobuf:"fixed32,22,opt,name=field18974" json:"field18974,omitempty"`
-	Field18975    *int32              `protobuf:"varint,18,opt,name=field18975" json:"field18975,omitempty"`
-	Field18976    *int32              `protobuf:"varint,19,opt,name=field18976" json:"field18976,omitempty"`
-	Field18977    *int32              `protobuf:"varint,20,opt,name=field18977" json:"field18977,omitempty"`
-	Field18978    *UnusedEmptyMessage `protobuf:"bytes,25,opt,name=field18978" json:"field18978,omitempty"`
-	Field18979    *UnusedEnum         `protobuf:"varint,26,opt,name=field18979,enum=benchmarks.google_message3.UnusedEnum" json:"field18979,omitempty"`
-	Field18980    []string            `protobuf:"bytes,27,rep,name=field18980" json:"field18980,omitempty"`
-	Field18981    *float32            `protobuf:"fixed32,28,opt,name=field18981" json:"field18981,omitempty"`
+
+	Field18959 *uint64             `protobuf:"varint,6,opt,name=field18959" json:"field18959,omitempty"`
+	Field18960 *string             `protobuf:"bytes,13,opt,name=field18960" json:"field18960,omitempty"`
+	Field18961 *bool               `protobuf:"varint,21,opt,name=field18961" json:"field18961,omitempty"`
+	Field18962 *bool               `protobuf:"varint,33,opt,name=field18962" json:"field18962,omitempty"`
+	Field18963 *int32              `protobuf:"varint,7,opt,name=field18963" json:"field18963,omitempty"`
+	Field18964 *int32              `protobuf:"varint,8,opt,name=field18964" json:"field18964,omitempty"`
+	Field18965 *string             `protobuf:"bytes,9,opt,name=field18965" json:"field18965,omitempty"`
+	Field18966 *Message18856       `protobuf:"bytes,10,opt,name=field18966" json:"field18966,omitempty"`
+	Field18967 *uint64             `protobuf:"varint,34,opt,name=field18967" json:"field18967,omitempty"`
+	Field18968 *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field18968" json:"field18968,omitempty"`
+	Field18969 *uint64             `protobuf:"varint,35,opt,name=field18969" json:"field18969,omitempty"`
+	Field18970 *float32            `protobuf:"fixed32,12,opt,name=field18970" json:"field18970,omitempty"`
+	Field18971 []string            `protobuf:"bytes,14,rep,name=field18971" json:"field18971,omitempty"`
+	Field18972 *bool               `protobuf:"varint,15,opt,name=field18972" json:"field18972,omitempty"`
+	Field18973 *bool               `protobuf:"varint,16,opt,name=field18973" json:"field18973,omitempty"`
+	Field18974 *float32            `protobuf:"fixed32,22,opt,name=field18974" json:"field18974,omitempty"`
+	Field18975 *int32              `protobuf:"varint,18,opt,name=field18975" json:"field18975,omitempty"`
+	Field18976 *int32              `protobuf:"varint,19,opt,name=field18976" json:"field18976,omitempty"`
+	Field18977 *int32              `protobuf:"varint,20,opt,name=field18977" json:"field18977,omitempty"`
+	Field18978 *UnusedEmptyMessage `protobuf:"bytes,25,opt,name=field18978" json:"field18978,omitempty"`
+	Field18979 *UnusedEnum         `protobuf:"varint,26,opt,name=field18979,enum=benchmarks.google_message3.UnusedEnum" json:"field18979,omitempty"`
+	Field18980 []string            `protobuf:"bytes,27,rep,name=field18980" json:"field18980,omitempty"`
+	Field18981 *float32            `protobuf:"fixed32,28,opt,name=field18981" json:"field18981,omitempty"`
 }
 
 func (x *Message18921_Message18922) Reset() {
@@ -4073,10 +4107,11 @@ type Message3886_Message3887 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3932     *string      `protobuf:"bytes,2,req,name=field3932" json:"field3932,omitempty"`
-	Field3933     *string      `protobuf:"bytes,9,opt,name=field3933" json:"field3933,omitempty"`
-	Field3934     *Message3850 `protobuf:"bytes,3,opt,name=field3934" json:"field3934,omitempty"`
-	Field3935     []byte       `protobuf:"bytes,8,opt,name=field3935" json:"field3935,omitempty"`
+
+	Field3932 *string      `protobuf:"bytes,2,req,name=field3932" json:"field3932,omitempty"`
+	Field3933 *string      `protobuf:"bytes,9,opt,name=field3933" json:"field3933,omitempty"`
+	Field3934 *Message3850 `protobuf:"bytes,3,opt,name=field3934" json:"field3934,omitempty"`
+	Field3935 []byte       `protobuf:"bytes,8,opt,name=field3935" json:"field3935,omitempty"`
 }
 
 func (x *Message3886_Message3887) Reset() {

internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go

@@ -55,7 +55,8 @@ type Message24401 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24679    *Message24400 `protobuf:"bytes,1,opt,name=field24679" json:"field24679,omitempty"`
+
+	Field24679 *Message24400 `protobuf:"bytes,1,opt,name=field24679" json:"field24679,omitempty"`
 }
 
 func (x *Message24401) Reset() {
@@ -96,7 +97,8 @@ type Message24402 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24680    *Message24400 `protobuf:"bytes,1,opt,name=field24680" json:"field24680,omitempty"`
+
+	Field24680 *Message24400 `protobuf:"bytes,1,opt,name=field24680" json:"field24680,omitempty"`
 }
 
 func (x *Message24402) Reset() {
@@ -137,24 +139,25 @@ type Message24379 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24603    *string               `protobuf:"bytes,1,opt,name=field24603" json:"field24603,omitempty"`
-	Field24604    *string               `protobuf:"bytes,2,opt,name=field24604" json:"field24604,omitempty"`
-	Field24605    *string               `protobuf:"bytes,3,opt,name=field24605" json:"field24605,omitempty"`
-	Field24606    *Message24380         `protobuf:"bytes,4,req,name=field24606" json:"field24606,omitempty"`
-	Field24607    *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field24607" json:"field24607,omitempty"`
-	Field24608    *string               `protobuf:"bytes,6,opt,name=field24608" json:"field24608,omitempty"`
-	Field24609    *Message24381         `protobuf:"bytes,7,opt,name=field24609" json:"field24609,omitempty"`
-	Field24610    []string              `protobuf:"bytes,8,rep,name=field24610" json:"field24610,omitempty"`
-	Field24611    []*UnusedEmptyMessage `protobuf:"bytes,17,rep,name=field24611" json:"field24611,omitempty"`
-	Field24612    []string              `protobuf:"bytes,9,rep,name=field24612" json:"field24612,omitempty"`
-	Field24613    []string              `protobuf:"bytes,10,rep,name=field24613" json:"field24613,omitempty"`
-	Field24614    []string              `protobuf:"bytes,11,rep,name=field24614" json:"field24614,omitempty"`
-	Field24615    *string               `protobuf:"bytes,14,opt,name=field24615" json:"field24615,omitempty"`
-	Field24616    *string               `protobuf:"bytes,12,opt,name=field24616" json:"field24616,omitempty"`
-	Field24617    *string               `protobuf:"bytes,16,opt,name=field24617" json:"field24617,omitempty"`
-	Field24618    []*UnusedEmptyMessage `protobuf:"bytes,13,rep,name=field24618" json:"field24618,omitempty"`
-	Field24619    []string              `protobuf:"bytes,15,rep,name=field24619" json:"field24619,omitempty"`
-	Field24620    []string              `protobuf:"bytes,18,rep,name=field24620" json:"field24620,omitempty"`
+
+	Field24603 *string               `protobuf:"bytes,1,opt,name=field24603" json:"field24603,omitempty"`
+	Field24604 *string               `protobuf:"bytes,2,opt,name=field24604" json:"field24604,omitempty"`
+	Field24605 *string               `protobuf:"bytes,3,opt,name=field24605" json:"field24605,omitempty"`
+	Field24606 *Message24380         `protobuf:"bytes,4,req,name=field24606" json:"field24606,omitempty"`
+	Field24607 *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field24607" json:"field24607,omitempty"`
+	Field24608 *string               `protobuf:"bytes,6,opt,name=field24608" json:"field24608,omitempty"`
+	Field24609 *Message24381         `protobuf:"bytes,7,opt,name=field24609" json:"field24609,omitempty"`
+	Field24610 []string              `protobuf:"bytes,8,rep,name=field24610" json:"field24610,omitempty"`
+	Field24611 []*UnusedEmptyMessage `protobuf:"bytes,17,rep,name=field24611" json:"field24611,omitempty"`
+	Field24612 []string              `protobuf:"bytes,9,rep,name=field24612" json:"field24612,omitempty"`
+	Field24613 []string              `protobuf:"bytes,10,rep,name=field24613" json:"field24613,omitempty"`
+	Field24614 []string              `protobuf:"bytes,11,rep,name=field24614" json:"field24614,omitempty"`
+	Field24615 *string               `protobuf:"bytes,14,opt,name=field24615" json:"field24615,omitempty"`
+	Field24616 *string               `protobuf:"bytes,12,opt,name=field24616" json:"field24616,omitempty"`
+	Field24617 *string               `protobuf:"bytes,16,opt,name=field24617" json:"field24617,omitempty"`
+	Field24618 []*UnusedEmptyMessage `protobuf:"bytes,13,rep,name=field24618" json:"field24618,omitempty"`
+	Field24619 []string              `protobuf:"bytes,15,rep,name=field24619" json:"field24619,omitempty"`
+	Field24620 []string              `protobuf:"bytes,18,rep,name=field24620" json:"field24620,omitempty"`
 }
 
 func (x *Message24379) Reset() {
@@ -314,8 +317,9 @@ type Message27358 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field27415    *int32 `protobuf:"varint,1,opt,name=field27415" json:"field27415,omitempty"`
-	Field27416    *int32 `protobuf:"varint,2,opt,name=field27416" json:"field27416,omitempty"`
+
+	Field27415 *int32 `protobuf:"varint,1,opt,name=field27415" json:"field27415,omitempty"`
+	Field27416 *int32 `protobuf:"varint,2,opt,name=field27416" json:"field27416,omitempty"`
 }
 
 func (x *Message27358) Reset() {
@@ -363,16 +367,17 @@ type Message34381 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field34398    *string             `protobuf:"bytes,1,opt,name=field34398" json:"field34398,omitempty"`
-	Field34399    *UnusedEmptyMessage `protobuf:"bytes,2,opt,name=field34399" json:"field34399,omitempty"`
-	Field34400    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field34400" json:"field34400,omitempty"`
-	Field34401    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field34401" json:"field34401,omitempty"`
-	Field34402    *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field34402" json:"field34402,omitempty"`
-	Field34403    *bool               `protobuf:"varint,6,opt,name=field34403" json:"field34403,omitempty"`
-	Field34404    *bool               `protobuf:"varint,7,opt,name=field34404" json:"field34404,omitempty"`
-	Field34405    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field34405" json:"field34405,omitempty"`
-	Field34406    *bool               `protobuf:"varint,9,opt,name=field34406" json:"field34406,omitempty"`
-	Field34407    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field34407" json:"field34407,omitempty"`
+
+	Field34398 *string             `protobuf:"bytes,1,opt,name=field34398" json:"field34398,omitempty"`
+	Field34399 *UnusedEmptyMessage `protobuf:"bytes,2,opt,name=field34399" json:"field34399,omitempty"`
+	Field34400 *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field34400" json:"field34400,omitempty"`
+	Field34401 *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field34401" json:"field34401,omitempty"`
+	Field34402 *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field34402" json:"field34402,omitempty"`
+	Field34403 *bool               `protobuf:"varint,6,opt,name=field34403" json:"field34403,omitempty"`
+	Field34404 *bool               `protobuf:"varint,7,opt,name=field34404" json:"field34404,omitempty"`
+	Field34405 *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field34405" json:"field34405,omitempty"`
+	Field34406 *bool               `protobuf:"varint,9,opt,name=field34406" json:"field34406,omitempty"`
+	Field34407 *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field34407" json:"field34407,omitempty"`
 }
 
 func (x *Message34381) Reset() {
@@ -476,13 +481,14 @@ type Message34619 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field34641    *float64            `protobuf:"fixed64,1,opt,name=field34641" json:"field34641,omitempty"`
-	Field34642    *float64            `protobuf:"fixed64,2,opt,name=field34642" json:"field34642,omitempty"`
-	Field34643    *float64            `protobuf:"fixed64,3,opt,name=field34643" json:"field34643,omitempty"`
-	Field34644    *float64            `protobuf:"fixed64,4,opt,name=field34644" json:"field34644,omitempty"`
-	Field34645    *float64            `protobuf:"fixed64,11,opt,name=field34645" json:"field34645,omitempty"`
-	Field34646    *float64            `protobuf:"fixed64,5,opt,name=field34646" json:"field34646,omitempty"`
-	Field34647    *UnusedEmptyMessage `protobuf:"bytes,100,opt,name=field34647" json:"field34647,omitempty"`
+
+	Field34641 *float64            `protobuf:"fixed64,1,opt,name=field34641" json:"field34641,omitempty"`
+	Field34642 *float64            `protobuf:"fixed64,2,opt,name=field34642" json:"field34642,omitempty"`
+	Field34643 *float64            `protobuf:"fixed64,3,opt,name=field34643" json:"field34643,omitempty"`
+	Field34644 *float64            `protobuf:"fixed64,4,opt,name=field34644" json:"field34644,omitempty"`
+	Field34645 *float64            `protobuf:"fixed64,11,opt,name=field34645" json:"field34645,omitempty"`
+	Field34646 *float64            `protobuf:"fixed64,5,opt,name=field34646" json:"field34646,omitempty"`
+	Field34647 *UnusedEmptyMessage `protobuf:"bytes,100,opt,name=field34647" json:"field34647,omitempty"`
 }
 
 func (x *Message34619) Reset() {
@@ -566,39 +572,40 @@ type Message730 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field897        *string               `protobuf:"bytes,19,opt,name=field897" json:"field897,omitempty"`
-	Field898        []string              `protobuf:"bytes,27,rep,name=field898" json:"field898,omitempty"`
-	Field899        []string              `protobuf:"bytes,28,rep,name=field899" json:"field899,omitempty"`
-	Field900        []string              `protobuf:"bytes,21,rep,name=field900" json:"field900,omitempty"`
-	Field901        *string               `protobuf:"bytes,30,opt,name=field901" json:"field901,omitempty"`
-	Field902        []uint32              `protobuf:"varint,20,rep,name=field902" json:"field902,omitempty"`
-	Field903        []uint32              `protobuf:"varint,32,rep,name=field903" json:"field903,omitempty"`
-	Field904        []string              `protobuf:"bytes,16,rep,name=field904" json:"field904,omitempty"`
-	Field905        []*Message697         `protobuf:"bytes,6,rep,name=field905" json:"field905,omitempty"`
-	Field906        []*Message704         `protobuf:"bytes,7,rep,name=field906" json:"field906,omitempty"`
-	Field907        []string              `protobuf:"bytes,18,rep,name=field907" json:"field907,omitempty"`
-	Field908        []*Message703         `protobuf:"bytes,8,rep,name=field908" json:"field908,omitempty"`
-	Field909        []string              `protobuf:"bytes,9,rep,name=field909" json:"field909,omitempty"`
-	Field910        *Message716           `protobuf:"bytes,10,opt,name=field910" json:"field910,omitempty"`
-	Field911        *Message718           `protobuf:"bytes,11,opt,name=field911" json:"field911,omitempty"`
-	Field912        *bool                 `protobuf:"varint,14,opt,name=field912" json:"field912,omitempty"`
-	Field913        []*Message715         `protobuf:"bytes,4,rep,name=field913" json:"field913,omitempty"`
-	Field914        []string              `protobuf:"bytes,17,rep,name=field914" json:"field914,omitempty"`
-	Field915        []string              `protobuf:"bytes,23,rep,name=field915" json:"field915,omitempty"`
-	Field916        []*Message719         `protobuf:"bytes,24,rep,name=field916" json:"field916,omitempty"`
-	Field917        []*Message728         `protobuf:"bytes,26,rep,name=field917" json:"field917,omitempty"`
-	Field918        []*Message702         `protobuf:"bytes,35,rep,name=field918" json:"field918,omitempty"`
-	Field919        *string               `protobuf:"bytes,36,opt,name=field919" json:"field919,omitempty"`
-	Field920        []string              `protobuf:"bytes,37,rep,name=field920" json:"field920,omitempty"`
-	Field921        *int64                `protobuf:"varint,38,opt,name=field921" json:"field921,omitempty"`
-	Field922        []*UnusedEmptyMessage `protobuf:"bytes,39,rep,name=field922" json:"field922,omitempty"`
-	Field923        []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field923" json:"field923,omitempty"`
-	Field924        *UnusedEmptyMessage   `protobuf:"bytes,2,opt,name=field924" json:"field924,omitempty"`
-	Field925        *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field925" json:"field925,omitempty"`
-	Field926        *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field926" json:"field926,omitempty"`
-	Field927        *UnusedEmptyMessage   `protobuf:"bytes,13,opt,name=field927" json:"field927,omitempty"`
-	Field928        []string              `protobuf:"bytes,22,rep,name=field928" json:"field928,omitempty"`
-	Field929        []byte                `protobuf:"bytes,31,opt,name=field929" json:"field929,omitempty"`
+
+	Field897 *string               `protobuf:"bytes,19,opt,name=field897" json:"field897,omitempty"`
+	Field898 []string              `protobuf:"bytes,27,rep,name=field898" json:"field898,omitempty"`
+	Field899 []string              `protobuf:"bytes,28,rep,name=field899" json:"field899,omitempty"`
+	Field900 []string              `protobuf:"bytes,21,rep,name=field900" json:"field900,omitempty"`
+	Field901 *string               `protobuf:"bytes,30,opt,name=field901" json:"field901,omitempty"`
+	Field902 []uint32              `protobuf:"varint,20,rep,name=field902" json:"field902,omitempty"`
+	Field903 []uint32              `protobuf:"varint,32,rep,name=field903" json:"field903,omitempty"`
+	Field904 []string              `protobuf:"bytes,16,rep,name=field904" json:"field904,omitempty"`
+	Field905 []*Message697         `protobuf:"bytes,6,rep,name=field905" json:"field905,omitempty"`
+	Field906 []*Message704         `protobuf:"bytes,7,rep,name=field906" json:"field906,omitempty"`
+	Field907 []string              `protobuf:"bytes,18,rep,name=field907" json:"field907,omitempty"`
+	Field908 []*Message703         `protobuf:"bytes,8,rep,name=field908" json:"field908,omitempty"`
+	Field909 []string              `protobuf:"bytes,9,rep,name=field909" json:"field909,omitempty"`
+	Field910 *Message716           `protobuf:"bytes,10,opt,name=field910" json:"field910,omitempty"`
+	Field911 *Message718           `protobuf:"bytes,11,opt,name=field911" json:"field911,omitempty"`
+	Field912 *bool                 `protobuf:"varint,14,opt,name=field912" json:"field912,omitempty"`
+	Field913 []*Message715         `protobuf:"bytes,4,rep,name=field913" json:"field913,omitempty"`
+	Field914 []string              `protobuf:"bytes,17,rep,name=field914" json:"field914,omitempty"`
+	Field915 []string              `protobuf:"bytes,23,rep,name=field915" json:"field915,omitempty"`
+	Field916 []*Message719         `protobuf:"bytes,24,rep,name=field916" json:"field916,omitempty"`
+	Field917 []*Message728         `protobuf:"bytes,26,rep,name=field917" json:"field917,omitempty"`
+	Field918 []*Message702         `protobuf:"bytes,35,rep,name=field918" json:"field918,omitempty"`
+	Field919 *string               `protobuf:"bytes,36,opt,name=field919" json:"field919,omitempty"`
+	Field920 []string              `protobuf:"bytes,37,rep,name=field920" json:"field920,omitempty"`
+	Field921 *int64                `protobuf:"varint,38,opt,name=field921" json:"field921,omitempty"`
+	Field922 []*UnusedEmptyMessage `protobuf:"bytes,39,rep,name=field922" json:"field922,omitempty"`
+	Field923 []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field923" json:"field923,omitempty"`
+	Field924 *UnusedEmptyMessage   `protobuf:"bytes,2,opt,name=field924" json:"field924,omitempty"`
+	Field925 *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field925" json:"field925,omitempty"`
+	Field926 *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field926" json:"field926,omitempty"`
+	Field927 *UnusedEmptyMessage   `protobuf:"bytes,13,opt,name=field927" json:"field927,omitempty"`
+	Field928 []string              `protobuf:"bytes,22,rep,name=field928" json:"field928,omitempty"`
+	Field929 []byte                `protobuf:"bytes,31,opt,name=field929" json:"field929,omitempty"`
 }
 
 func (x *Message730) Reset() {
@@ -875,10 +882,11 @@ type Message33958 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field33977    *string                      `protobuf:"bytes,1,opt,name=field33977" json:"field33977,omitempty"`
-	Field33978    *string                      `protobuf:"bytes,9,opt,name=field33978" json:"field33978,omitempty"`
-	Message33959  []*Message33958_Message33959 `protobuf:"group,2,rep,name=Message33959,json=message33959" json:"message33959,omitempty"`
-	Field33980    *Enum33960                   `protobuf:"varint,7,opt,name=field33980,enum=benchmarks.google_message3.Enum33960" json:"field33980,omitempty"`
+
+	Field33977   *string                      `protobuf:"bytes,1,opt,name=field33977" json:"field33977,omitempty"`
+	Field33978   *string                      `protobuf:"bytes,9,opt,name=field33978" json:"field33978,omitempty"`
+	Message33959 []*Message33958_Message33959 `protobuf:"group,2,rep,name=Message33959,json=message33959" json:"message33959,omitempty"`
+	Field33980   *Enum33960                   `protobuf:"varint,7,opt,name=field33980,enum=benchmarks.google_message3.Enum33960" json:"field33980,omitempty"`
 }
 
 func (x *Message33958) Reset() {
@@ -940,11 +948,12 @@ type Message6637 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6670     *UnusedEmptyMessage   `protobuf:"bytes,2,opt,name=field6670" json:"field6670,omitempty"`
-	Field6671     []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field6671" json:"field6671,omitempty"`
-	Field6672     *int32                `protobuf:"varint,3,opt,name=field6672" json:"field6672,omitempty"`
-	Field6673     []string              `protobuf:"bytes,4,rep,name=field6673" json:"field6673,omitempty"`
-	Field6674     *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field6674" json:"field6674,omitempty"`
+
+	Field6670 *UnusedEmptyMessage   `protobuf:"bytes,2,opt,name=field6670" json:"field6670,omitempty"`
+	Field6671 []*UnusedEmptyMessage `protobuf:"bytes,1,rep,name=field6671" json:"field6671,omitempty"`
+	Field6672 *int32                `protobuf:"varint,3,opt,name=field6672" json:"field6672,omitempty"`
+	Field6673 []string              `protobuf:"bytes,4,rep,name=field6673" json:"field6673,omitempty"`
+	Field6674 *UnusedEmptyMessage   `protobuf:"bytes,5,opt,name=field6674" json:"field6674,omitempty"`
 }
 
 func (x *Message6637) Reset() {
@@ -1013,24 +1022,25 @@ type Message6643 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6683     *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field6683" json:"field6683,omitempty"`
-	Field6684     *UnusedEmptyMessage   `protobuf:"bytes,4,opt,name=field6684" json:"field6684,omitempty"`
-	Field6685     *float64              `protobuf:"fixed64,5,opt,name=field6685" json:"field6685,omitempty"`
-	Field6686     *float64              `protobuf:"fixed64,6,opt,name=field6686" json:"field6686,omitempty"`
-	Field6687     *int32                `protobuf:"varint,1,opt,name=field6687" json:"field6687,omitempty"`
-	Field6688     *int32                `protobuf:"varint,2,opt,name=field6688" json:"field6688,omitempty"`
-	Field6689     *float64              `protobuf:"fixed64,9,opt,name=field6689" json:"field6689,omitempty"`
-	Field6690     []byte                `protobuf:"bytes,10,opt,name=field6690" json:"field6690,omitempty"`
-	Field6691     *int32                `protobuf:"varint,11,opt,name=field6691" json:"field6691,omitempty"`
-	Field6692     *bool                 `protobuf:"varint,12,opt,name=field6692" json:"field6692,omitempty"`
-	Field6693     *bool                 `protobuf:"varint,13,opt,name=field6693" json:"field6693,omitempty"`
-	Field6694     *Message6578          `protobuf:"bytes,15,opt,name=field6694" json:"field6694,omitempty"`
-	Field6695     *UnusedEnum           `protobuf:"varint,16,opt,name=field6695,enum=benchmarks.google_message3.UnusedEnum" json:"field6695,omitempty"`
-	Field6696     *int64                `protobuf:"varint,17,opt,name=field6696" json:"field6696,omitempty"`
-	Field6697     []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field6697" json:"field6697,omitempty"`
-	Field6698     *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field6698" json:"field6698,omitempty"`
-	Field6699     *UnusedEmptyMessage   `protobuf:"bytes,20,opt,name=field6699" json:"field6699,omitempty"`
-	Field6700     *int32                `protobuf:"varint,21,opt,name=field6700" json:"field6700,omitempty"`
+
+	Field6683 *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field6683" json:"field6683,omitempty"`
+	Field6684 *UnusedEmptyMessage   `protobuf:"bytes,4,opt,name=field6684" json:"field6684,omitempty"`
+	Field6685 *float64              `protobuf:"fixed64,5,opt,name=field6685" json:"field6685,omitempty"`
+	Field6686 *float64              `protobuf:"fixed64,6,opt,name=field6686" json:"field6686,omitempty"`
+	Field6687 *int32                `protobuf:"varint,1,opt,name=field6687" json:"field6687,omitempty"`
+	Field6688 *int32                `protobuf:"varint,2,opt,name=field6688" json:"field6688,omitempty"`
+	Field6689 *float64              `protobuf:"fixed64,9,opt,name=field6689" json:"field6689,omitempty"`
+	Field6690 []byte                `protobuf:"bytes,10,opt,name=field6690" json:"field6690,omitempty"`
+	Field6691 *int32                `protobuf:"varint,11,opt,name=field6691" json:"field6691,omitempty"`
+	Field6692 *bool                 `protobuf:"varint,12,opt,name=field6692" json:"field6692,omitempty"`
+	Field6693 *bool                 `protobuf:"varint,13,opt,name=field6693" json:"field6693,omitempty"`
+	Field6694 *Message6578          `protobuf:"bytes,15,opt,name=field6694" json:"field6694,omitempty"`
+	Field6695 *UnusedEnum           `protobuf:"varint,16,opt,name=field6695,enum=benchmarks.google_message3.UnusedEnum" json:"field6695,omitempty"`
+	Field6696 *int64                `protobuf:"varint,17,opt,name=field6696" json:"field6696,omitempty"`
+	Field6697 []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field6697" json:"field6697,omitempty"`
+	Field6698 *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field6698" json:"field6698,omitempty"`
+	Field6699 *UnusedEmptyMessage   `protobuf:"bytes,20,opt,name=field6699" json:"field6699,omitempty"`
+	Field6700 *int32                `protobuf:"varint,21,opt,name=field6700" json:"field6700,omitempty"`
 }
 
 func (x *Message6643) Reset() {
@@ -1190,25 +1200,26 @@ type Message6126 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6152     *string               `protobuf:"bytes,1,req,name=field6152" json:"field6152,omitempty"`
-	Field6153     []*UnusedEmptyMessage `protobuf:"bytes,9,rep,name=field6153" json:"field6153,omitempty"`
-	Field6154     *int32                `protobuf:"varint,14,opt,name=field6154" json:"field6154,omitempty"`
-	Field6155     []byte                `protobuf:"bytes,10,opt,name=field6155" json:"field6155,omitempty"`
-	Field6156     *Message6024          `protobuf:"bytes,12,opt,name=field6156" json:"field6156,omitempty"`
-	Field6157     *int32                `protobuf:"varint,4,opt,name=field6157" json:"field6157,omitempty"`
-	Field6158     *string               `protobuf:"bytes,5,opt,name=field6158" json:"field6158,omitempty"`
-	Field6159     *int32                `protobuf:"varint,6,opt,name=field6159" json:"field6159,omitempty"`
-	Field6160     []int32               `protobuf:"varint,2,rep,name=field6160" json:"field6160,omitempty"`
-	Field6161     []int32               `protobuf:"varint,3,rep,name=field6161" json:"field6161,omitempty"`
-	Field6162     []*Message6052        `protobuf:"bytes,7,rep,name=field6162" json:"field6162,omitempty"`
-	Field6163     []*UnusedEmptyMessage `protobuf:"bytes,11,rep,name=field6163" json:"field6163,omitempty"`
-	Field6164     *Enum6065             `protobuf:"varint,15,opt,name=field6164,enum=benchmarks.google_message3.Enum6065" json:"field6164,omitempty"`
-	Field6165     []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field6165" json:"field6165,omitempty"`
-	Field6166     *bool                 `protobuf:"varint,13,opt,name=field6166" json:"field6166,omitempty"`
-	Field6167     *bool                 `protobuf:"varint,16,opt,name=field6167" json:"field6167,omitempty"`
-	Field6168     *bool                 `protobuf:"varint,18,opt,name=field6168" json:"field6168,omitempty"`
-	Field6169     []*Message6054        `protobuf:"bytes,17,rep,name=field6169" json:"field6169,omitempty"`
-	Field6170     *int32                `protobuf:"varint,19,opt,name=field6170" json:"field6170,omitempty"`
+
+	Field6152 *string               `protobuf:"bytes,1,req,name=field6152" json:"field6152,omitempty"`
+	Field6153 []*UnusedEmptyMessage `protobuf:"bytes,9,rep,name=field6153" json:"field6153,omitempty"`
+	Field6154 *int32                `protobuf:"varint,14,opt,name=field6154" json:"field6154,omitempty"`
+	Field6155 []byte                `protobuf:"bytes,10,opt,name=field6155" json:"field6155,omitempty"`
+	Field6156 *Message6024          `protobuf:"bytes,12,opt,name=field6156" json:"field6156,omitempty"`
+	Field6157 *int32                `protobuf:"varint,4,opt,name=field6157" json:"field6157,omitempty"`
+	Field6158 *string               `protobuf:"bytes,5,opt,name=field6158" json:"field6158,omitempty"`
+	Field6159 *int32                `protobuf:"varint,6,opt,name=field6159" json:"field6159,omitempty"`
+	Field6160 []int32               `protobuf:"varint,2,rep,name=field6160" json:"field6160,omitempty"`
+	Field6161 []int32               `protobuf:"varint,3,rep,name=field6161" json:"field6161,omitempty"`
+	Field6162 []*Message6052        `protobuf:"bytes,7,rep,name=field6162" json:"field6162,omitempty"`
+	Field6163 []*UnusedEmptyMessage `protobuf:"bytes,11,rep,name=field6163" json:"field6163,omitempty"`
+	Field6164 *Enum6065             `protobuf:"varint,15,opt,name=field6164,enum=benchmarks.google_message3.Enum6065" json:"field6164,omitempty"`
+	Field6165 []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field6165" json:"field6165,omitempty"`
+	Field6166 *bool                 `protobuf:"varint,13,opt,name=field6166" json:"field6166,omitempty"`
+	Field6167 *bool                 `protobuf:"varint,16,opt,name=field6167" json:"field6167,omitempty"`
+	Field6168 *bool                 `protobuf:"varint,18,opt,name=field6168" json:"field6168,omitempty"`
+	Field6169 []*Message6054        `protobuf:"bytes,17,rep,name=field6169" json:"field6169,omitempty"`
+	Field6170 *int32                `protobuf:"varint,19,opt,name=field6170" json:"field6170,omitempty"`
 }
 
 func (x *Message6126) Reset() {
@@ -1375,16 +1386,17 @@ type Message13083 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13096    *float32                     `protobuf:"fixed32,1,opt,name=field13096" json:"field13096,omitempty"`
-	Message13084  []*Message13083_Message13084 `protobuf:"group,2,rep,name=Message13084,json=message13084" json:"message13084,omitempty"`
-	Field13098    *float32                     `protobuf:"fixed32,44,opt,name=field13098" json:"field13098,omitempty"`
-	Field13099    *float32                     `protobuf:"fixed32,45,opt,name=field13099" json:"field13099,omitempty"`
-	Field13100    *uint64                      `protobuf:"varint,46,opt,name=field13100" json:"field13100,omitempty"`
-	Field13101    *float32                     `protobuf:"fixed32,47,opt,name=field13101" json:"field13101,omitempty"`
-	Message13085  *Message13083_Message13085   `protobuf:"group,16,opt,name=Message13085,json=message13085" json:"message13085,omitempty"`
-	Message13086  []*Message13083_Message13086 `protobuf:"group,23,rep,name=Message13086,json=message13086" json:"message13086,omitempty"`
-	Message13087  []*Message13083_Message13087 `protobuf:"group,29,rep,name=Message13087,json=message13087" json:"message13087,omitempty"`
-	Field13105    *UnusedEmptyMessage          `protobuf:"bytes,43,opt,name=field13105" json:"field13105,omitempty"`
+
+	Field13096   *float32                     `protobuf:"fixed32,1,opt,name=field13096" json:"field13096,omitempty"`
+	Message13084 []*Message13083_Message13084 `protobuf:"group,2,rep,name=Message13084,json=message13084" json:"message13084,omitempty"`
+	Field13098   *float32                     `protobuf:"fixed32,44,opt,name=field13098" json:"field13098,omitempty"`
+	Field13099   *float32                     `protobuf:"fixed32,45,opt,name=field13099" json:"field13099,omitempty"`
+	Field13100   *uint64                      `protobuf:"varint,46,opt,name=field13100" json:"field13100,omitempty"`
+	Field13101   *float32                     `protobuf:"fixed32,47,opt,name=field13101" json:"field13101,omitempty"`
+	Message13085 *Message13083_Message13085   `protobuf:"group,16,opt,name=Message13085,json=message13085" json:"message13085,omitempty"`
+	Message13086 []*Message13083_Message13086 `protobuf:"group,23,rep,name=Message13086,json=message13086" json:"message13086,omitempty"`
+	Message13087 []*Message13083_Message13087 `protobuf:"group,29,rep,name=Message13087,json=message13087" json:"message13087,omitempty"`
+	Field13105   *UnusedEmptyMessage          `protobuf:"bytes,43,opt,name=field13105" json:"field13105,omitempty"`
 }
 
 func (x *Message13083) Reset() {
@@ -1488,9 +1500,10 @@ type Message13088 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Message13089  []*Message13088_Message13089 `protobuf:"group,1,rep,name=Message13089,json=message13089" json:"message13089,omitempty"`
-	Field13136    *int64                       `protobuf:"varint,4,opt,name=field13136" json:"field13136,omitempty"`
-	Field13137    *bool                        `protobuf:"varint,5,opt,name=field13137" json:"field13137,omitempty"`
+
+	Message13089 []*Message13088_Message13089 `protobuf:"group,1,rep,name=Message13089,json=message13089" json:"message13089,omitempty"`
+	Field13136   *int64                       `protobuf:"varint,4,opt,name=field13136" json:"field13136,omitempty"`
+	Field13137   *bool                        `protobuf:"varint,5,opt,name=field13137" json:"field13137,omitempty"`
 }
 
 func (x *Message13088) Reset() {
@@ -1545,15 +1558,16 @@ type Message10391 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10411    *Enum10392          `protobuf:"varint,1,opt,name=field10411,enum=benchmarks.google_message3.Enum10392" json:"field10411,omitempty"`
-	Field10412    *UnusedEnum         `protobuf:"varint,2,opt,name=field10412,enum=benchmarks.google_message3.UnusedEnum" json:"field10412,omitempty"`
-	Field10413    *int64              `protobuf:"varint,3,opt,name=field10413" json:"field10413,omitempty"`
-	Field10414    *string             `protobuf:"bytes,4,opt,name=field10414" json:"field10414,omitempty"`
-	Field10415    *string             `protobuf:"bytes,5,opt,name=field10415" json:"field10415,omitempty"`
-	Field10416    []byte              `protobuf:"bytes,6,opt,name=field10416" json:"field10416,omitempty"`
-	Field10417    *bool               `protobuf:"varint,8,opt,name=field10417" json:"field10417,omitempty"`
-	Field10418    *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field10418" json:"field10418,omitempty"`
-	Field10419    *bool               `protobuf:"varint,10,opt,name=field10419" json:"field10419,omitempty"`
+
+	Field10411 *Enum10392          `protobuf:"varint,1,opt,name=field10411,enum=benchmarks.google_message3.Enum10392" json:"field10411,omitempty"`
+	Field10412 *UnusedEnum         `protobuf:"varint,2,opt,name=field10412,enum=benchmarks.google_message3.UnusedEnum" json:"field10412,omitempty"`
+	Field10413 *int64              `protobuf:"varint,3,opt,name=field10413" json:"field10413,omitempty"`
+	Field10414 *string             `protobuf:"bytes,4,opt,name=field10414" json:"field10414,omitempty"`
+	Field10415 *string             `protobuf:"bytes,5,opt,name=field10415" json:"field10415,omitempty"`
+	Field10416 []byte              `protobuf:"bytes,6,opt,name=field10416" json:"field10416,omitempty"`
+	Field10417 *bool               `protobuf:"varint,8,opt,name=field10417" json:"field10417,omitempty"`
+	Field10418 *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field10418" json:"field10418,omitempty"`
+	Field10419 *bool               `protobuf:"varint,10,opt,name=field10419" json:"field10419,omitempty"`
 }
 
 func (x *Message10391) Reset() {
@@ -1651,18 +1665,19 @@ type Message11873 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field11876      *string             `protobuf:"bytes,1,opt,name=field11876" json:"field11876,omitempty"`
-	Field11877      *string             `protobuf:"bytes,4,opt,name=field11877" json:"field11877,omitempty"`
-	Field11878      *Message10573       `protobuf:"bytes,5,opt,name=field11878" json:"field11878,omitempty"`
-	Field11879      *Message10582       `protobuf:"bytes,6,opt,name=field11879" json:"field11879,omitempty"`
-	Field11880      *Message10824       `protobuf:"bytes,7,opt,name=field11880" json:"field11880,omitempty"`
-	Field11881      *Message10773       `protobuf:"bytes,12,opt,name=field11881" json:"field11881,omitempty"`
-	Field11882      *Message11866       `protobuf:"bytes,8,opt,name=field11882" json:"field11882,omitempty"`
-	Field11883      *Message10818       `protobuf:"bytes,13,opt,name=field11883" json:"field11883,omitempty"`
-	Field11884      *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field11884" json:"field11884,omitempty"`
-	Field11885      *Message10155       `protobuf:"bytes,11,opt,name=field11885" json:"field11885,omitempty"`
-	Field11886      *Message10469       `protobuf:"bytes,14,opt,name=field11886" json:"field11886,omitempty"`
-	Field11887      *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field11887" json:"field11887,omitempty"`
+
+	Field11876 *string             `protobuf:"bytes,1,opt,name=field11876" json:"field11876,omitempty"`
+	Field11877 *string             `protobuf:"bytes,4,opt,name=field11877" json:"field11877,omitempty"`
+	Field11878 *Message10573       `protobuf:"bytes,5,opt,name=field11878" json:"field11878,omitempty"`
+	Field11879 *Message10582       `protobuf:"bytes,6,opt,name=field11879" json:"field11879,omitempty"`
+	Field11880 *Message10824       `protobuf:"bytes,7,opt,name=field11880" json:"field11880,omitempty"`
+	Field11881 *Message10773       `protobuf:"bytes,12,opt,name=field11881" json:"field11881,omitempty"`
+	Field11882 *Message11866       `protobuf:"bytes,8,opt,name=field11882" json:"field11882,omitempty"`
+	Field11883 *Message10818       `protobuf:"bytes,13,opt,name=field11883" json:"field11883,omitempty"`
+	Field11884 *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field11884" json:"field11884,omitempty"`
+	Field11885 *Message10155       `protobuf:"bytes,11,opt,name=field11885" json:"field11885,omitempty"`
+	Field11886 *Message10469       `protobuf:"bytes,14,opt,name=field11886" json:"field11886,omitempty"`
+	Field11887 *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field11887" json:"field11887,omitempty"`
 }
 
 func (x *Message11873) Reset() {
@@ -1790,10 +1805,11 @@ type Message35506 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field35524    *int32                `protobuf:"varint,1,opt,name=field35524" json:"field35524,omitempty"`
-	Field35525    *string               `protobuf:"bytes,2,opt,name=field35525" json:"field35525,omitempty"`
-	Field35526    *Enum35507            `protobuf:"varint,3,opt,name=field35526,enum=benchmarks.google_message3.Enum35507" json:"field35526,omitempty"`
-	Field35527    []*UnusedEmptyMessage `protobuf:"bytes,4,rep,name=field35527" json:"field35527,omitempty"`
+
+	Field35524 *int32                `protobuf:"varint,1,opt,name=field35524" json:"field35524,omitempty"`
+	Field35525 *string               `protobuf:"bytes,2,opt,name=field35525" json:"field35525,omitempty"`
+	Field35526 *Enum35507            `protobuf:"varint,3,opt,name=field35526,enum=benchmarks.google_message3.Enum35507" json:"field35526,omitempty"`
+	Field35527 []*UnusedEmptyMessage `protobuf:"bytes,4,rep,name=field35527" json:"field35527,omitempty"`
 }
 
 func (x *Message35506) Reset() {
@@ -1855,7 +1871,8 @@ type Message13151 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13158    []*Message13145 `protobuf:"bytes,1,rep,name=field13158" json:"field13158,omitempty"`
+
+	Field13158 []*Message13145 `protobuf:"bytes,1,rep,name=field13158" json:"field13158,omitempty"`
 }
 
 func (x *Message13151) Reset() {
@@ -1896,7 +1913,8 @@ type Message18253 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Message18254  []*Message18253_Message18254 `protobuf:"group,1,rep,name=Message18254,json=message18254" json:"message18254,omitempty"`
+
+	Message18254 []*Message18253_Message18254 `protobuf:"group,1,rep,name=Message18254,json=message18254" json:"message18254,omitempty"`
 }
 
 func (x *Message18253) Reset() {
@@ -1937,7 +1955,8 @@ type Message16685 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16694    []*Message16686 `protobuf:"bytes,2,rep,name=field16694" json:"field16694,omitempty"`
+
+	Field16694 []*Message16686 `protobuf:"bytes,2,rep,name=field16694" json:"field16694,omitempty"`
 }
 
 func (x *Message16685) Reset() {
@@ -1978,16 +1997,17 @@ type Message16816 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16826    *float32                     `protobuf:"fixed32,1,opt,name=field16826" json:"field16826,omitempty"`
-	Field16827    *Enum16819                   `protobuf:"varint,2,opt,name=field16827,enum=benchmarks.google_message3.Enum16819" json:"field16827,omitempty"`
-	Field16828    *float32                     `protobuf:"fixed32,3,opt,name=field16828" json:"field16828,omitempty"`
-	Message16817  []*Message16816_Message16817 `protobuf:"group,4,rep,name=Message16817,json=message16817" json:"message16817,omitempty"`
-	Field16830    *bool                        `protobuf:"varint,7,opt,name=field16830" json:"field16830,omitempty"`
-	Field16831    *bool                        `protobuf:"varint,8,opt,name=field16831" json:"field16831,omitempty"`
-	Message16818  []*Message16816_Message16818 `protobuf:"group,12,rep,name=Message16818,json=message16818" json:"message16818,omitempty"`
-	Field16833    *string                      `protobuf:"bytes,10,opt,name=field16833" json:"field16833,omitempty"`
-	Field16834    *bool                        `protobuf:"varint,13,opt,name=field16834" json:"field16834,omitempty"`
-	Field16835    *bool                        `protobuf:"varint,14,opt,name=field16835" json:"field16835,omitempty"`
+
+	Field16826   *float32                     `protobuf:"fixed32,1,opt,name=field16826" json:"field16826,omitempty"`
+	Field16827   *Enum16819                   `protobuf:"varint,2,opt,name=field16827,enum=benchmarks.google_message3.Enum16819" json:"field16827,omitempty"`
+	Field16828   *float32                     `protobuf:"fixed32,3,opt,name=field16828" json:"field16828,omitempty"`
+	Message16817 []*Message16816_Message16817 `protobuf:"group,4,rep,name=Message16817,json=message16817" json:"message16817,omitempty"`
+	Field16830   *bool                        `protobuf:"varint,7,opt,name=field16830" json:"field16830,omitempty"`
+	Field16831   *bool                        `protobuf:"varint,8,opt,name=field16831" json:"field16831,omitempty"`
+	Message16818 []*Message16816_Message16818 `protobuf:"group,12,rep,name=Message16818,json=message16818" json:"message16818,omitempty"`
+	Field16833   *string                      `protobuf:"bytes,10,opt,name=field16833" json:"field16833,omitempty"`
+	Field16834   *bool                        `protobuf:"varint,13,opt,name=field16834" json:"field16834,omitempty"`
+	Field16835   *bool                        `protobuf:"varint,14,opt,name=field16835" json:"field16835,omitempty"`
 }
 
 func (x *Message16816) Reset() {
@@ -2091,17 +2111,18 @@ type Message13168 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13212    *int32        `protobuf:"varint,1,req,name=field13212" json:"field13212,omitempty"`
-	Field13213    *uint64       `protobuf:"fixed64,7,opt,name=field13213" json:"field13213,omitempty"`
-	Field13214    *bool         `protobuf:"varint,8,opt,name=field13214" json:"field13214,omitempty"`
-	Field13215    *uint64       `protobuf:"fixed64,10,opt,name=field13215" json:"field13215,omitempty"`
-	Field13216    *bool         `protobuf:"varint,11,opt,name=field13216" json:"field13216,omitempty"`
-	Field13217    *Message12796 `protobuf:"bytes,9,opt,name=field13217" json:"field13217,omitempty"`
-	Field13218    *float64      `protobuf:"fixed64,2,req,name=field13218" json:"field13218,omitempty"`
-	Field13219    *bool         `protobuf:"varint,3,req,name=field13219" json:"field13219,omitempty"`
-	Field13220    *int32        `protobuf:"varint,4,opt,name=field13220" json:"field13220,omitempty"`
-	Field13221    *bool         `protobuf:"varint,5,req,name=field13221" json:"field13221,omitempty"`
-	Field13222    *int32        `protobuf:"varint,6,opt,name=field13222" json:"field13222,omitempty"`
+
+	Field13212 *int32        `protobuf:"varint,1,req,name=field13212" json:"field13212,omitempty"`
+	Field13213 *uint64       `protobuf:"fixed64,7,opt,name=field13213" json:"field13213,omitempty"`
+	Field13214 *bool         `protobuf:"varint,8,opt,name=field13214" json:"field13214,omitempty"`
+	Field13215 *uint64       `protobuf:"fixed64,10,opt,name=field13215" json:"field13215,omitempty"`
+	Field13216 *bool         `protobuf:"varint,11,opt,name=field13216" json:"field13216,omitempty"`
+	Field13217 *Message12796 `protobuf:"bytes,9,opt,name=field13217" json:"field13217,omitempty"`
+	Field13218 *float64      `protobuf:"fixed64,2,req,name=field13218" json:"field13218,omitempty"`
+	Field13219 *bool         `protobuf:"varint,3,req,name=field13219" json:"field13219,omitempty"`
+	Field13220 *int32        `protobuf:"varint,4,opt,name=field13220" json:"field13220,omitempty"`
+	Field13221 *bool         `protobuf:"varint,5,req,name=field13221" json:"field13221,omitempty"`
+	Field13222 *int32        `protobuf:"varint,6,opt,name=field13222" json:"field13222,omitempty"`
 }
 
 func (x *Message13168) Reset() {
@@ -2212,19 +2233,20 @@ type Message13167 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13199    *int32        `protobuf:"varint,1,req,name=field13199" json:"field13199,omitempty"`
-	Field13200    *int32        `protobuf:"varint,2,opt,name=field13200" json:"field13200,omitempty"`
-	Field13201    *int32        `protobuf:"varint,3,opt,name=field13201" json:"field13201,omitempty"`
-	Field13202    *bool         `protobuf:"varint,8,opt,name=field13202" json:"field13202,omitempty"`
-	Field13203    *uint64       `protobuf:"fixed64,12,opt,name=field13203" json:"field13203,omitempty"`
-	Field13204    *bool         `protobuf:"varint,13,opt,name=field13204" json:"field13204,omitempty"`
-	Field13205    *Message12796 `protobuf:"bytes,11,opt,name=field13205" json:"field13205,omitempty"`
-	Field13206    *uint64       `protobuf:"fixed64,9,opt,name=field13206" json:"field13206,omitempty"`
-	Field13207    *bool         `protobuf:"varint,10,opt,name=field13207" json:"field13207,omitempty"`
-	Field13208    []int32       `protobuf:"varint,4,rep,name=field13208" json:"field13208,omitempty"`
-	Field13209    *int32        `protobuf:"varint,5,opt,name=field13209" json:"field13209,omitempty"`
-	Field13210    *int32        `protobuf:"varint,6,opt,name=field13210" json:"field13210,omitempty"`
-	Field13211    *int32        `protobuf:"varint,7,opt,name=field13211" json:"field13211,omitempty"`
+
+	Field13199 *int32        `protobuf:"varint,1,req,name=field13199" json:"field13199,omitempty"`
+	Field13200 *int32        `protobuf:"varint,2,opt,name=field13200" json:"field13200,omitempty"`
+	Field13201 *int32        `protobuf:"varint,3,opt,name=field13201" json:"field13201,omitempty"`
+	Field13202 *bool         `protobuf:"varint,8,opt,name=field13202" json:"field13202,omitempty"`
+	Field13203 *uint64       `protobuf:"fixed64,12,opt,name=field13203" json:"field13203,omitempty"`
+	Field13204 *bool         `protobuf:"varint,13,opt,name=field13204" json:"field13204,omitempty"`
+	Field13205 *Message12796 `protobuf:"bytes,11,opt,name=field13205" json:"field13205,omitempty"`
+	Field13206 *uint64       `protobuf:"fixed64,9,opt,name=field13206" json:"field13206,omitempty"`
+	Field13207 *bool         `protobuf:"varint,10,opt,name=field13207" json:"field13207,omitempty"`
+	Field13208 []int32       `protobuf:"varint,4,rep,name=field13208" json:"field13208,omitempty"`
+	Field13209 *int32        `protobuf:"varint,5,opt,name=field13209" json:"field13209,omitempty"`
+	Field13210 *int32        `protobuf:"varint,6,opt,name=field13210" json:"field13210,omitempty"`
+	Field13211 *int32        `protobuf:"varint,7,opt,name=field13211" json:"field13211,omitempty"`
 }
 
 func (x *Message13167) Reset() {
@@ -2349,8 +2371,9 @@ type Message1374 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1375     *string `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
-	Field1376     *string `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
+
+	Field1375 *string `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
+	Field1376 *string `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
 }
 
 func (x *Message1374) Reset() {
@@ -2464,37 +2487,38 @@ type Message18856 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field18857    *string  `protobuf:"bytes,1,opt,name=field18857" json:"field18857,omitempty"`
-	Field18858    *string  `protobuf:"bytes,2,opt,name=field18858" json:"field18858,omitempty"`
-	Field18859    *bool    `protobuf:"varint,31,opt,name=field18859" json:"field18859,omitempty"`
-	Field18860    *string  `protobuf:"bytes,26,opt,name=field18860" json:"field18860,omitempty"`
-	Field18861    *string  `protobuf:"bytes,3,opt,name=field18861" json:"field18861,omitempty"`
-	Field18862    *string  `protobuf:"bytes,4,opt,name=field18862" json:"field18862,omitempty"`
-	Field18863    *string  `protobuf:"bytes,5,opt,name=field18863" json:"field18863,omitempty"`
-	Field18864    *string  `protobuf:"bytes,17,opt,name=field18864" json:"field18864,omitempty"`
-	Field18865    *string  `protobuf:"bytes,6,opt,name=field18865" json:"field18865,omitempty"`
-	Field18866    *string  `protobuf:"bytes,7,opt,name=field18866" json:"field18866,omitempty"`
-	Field18867    *string  `protobuf:"bytes,8,opt,name=field18867" json:"field18867,omitempty"`
-	Field18868    *string  `protobuf:"bytes,9,opt,name=field18868" json:"field18868,omitempty"`
-	Field18869    *string  `protobuf:"bytes,10,opt,name=field18869" json:"field18869,omitempty"`
-	Field18870    *string  `protobuf:"bytes,11,opt,name=field18870" json:"field18870,omitempty"`
-	Field18871    *string  `protobuf:"bytes,21,opt,name=field18871" json:"field18871,omitempty"`
-	Field18872    *string  `protobuf:"bytes,18,opt,name=field18872" json:"field18872,omitempty"`
-	Field18873    *string  `protobuf:"bytes,19,opt,name=field18873" json:"field18873,omitempty"`
-	Field18874    *string  `protobuf:"bytes,20,opt,name=field18874" json:"field18874,omitempty"`
-	Field18875    *string  `protobuf:"bytes,22,opt,name=field18875" json:"field18875,omitempty"`
-	Field18876    *string  `protobuf:"bytes,23,opt,name=field18876" json:"field18876,omitempty"`
-	Field18877    *string  `protobuf:"bytes,24,opt,name=field18877" json:"field18877,omitempty"`
-	Field18878    *string  `protobuf:"bytes,25,opt,name=field18878" json:"field18878,omitempty"`
-	Field18879    *string  `protobuf:"bytes,12,opt,name=field18879" json:"field18879,omitempty"`
-	Field18880    *string  `protobuf:"bytes,13,opt,name=field18880" json:"field18880,omitempty"`
-	Field18881    *string  `protobuf:"bytes,29,opt,name=field18881" json:"field18881,omitempty"`
-	Field18882    *string  `protobuf:"bytes,30,opt,name=field18882" json:"field18882,omitempty"`
-	Field18883    *string  `protobuf:"bytes,15,opt,name=field18883" json:"field18883,omitempty"`
-	Field18884    *string  `protobuf:"bytes,16,opt,name=field18884" json:"field18884,omitempty"`
-	Field18885    []string `protobuf:"bytes,14,rep,name=field18885" json:"field18885,omitempty"`
-	Field18886    *string  `protobuf:"bytes,27,opt,name=field18886" json:"field18886,omitempty"`
-	Field18887    *string  `protobuf:"bytes,28,opt,name=field18887" json:"field18887,omitempty"`
+
+	Field18857 *string  `protobuf:"bytes,1,opt,name=field18857" json:"field18857,omitempty"`
+	Field18858 *string  `protobuf:"bytes,2,opt,name=field18858" json:"field18858,omitempty"`
+	Field18859 *bool    `protobuf:"varint,31,opt,name=field18859" json:"field18859,omitempty"`
+	Field18860 *string  `protobuf:"bytes,26,opt,name=field18860" json:"field18860,omitempty"`
+	Field18861 *string  `protobuf:"bytes,3,opt,name=field18861" json:"field18861,omitempty"`
+	Field18862 *string  `protobuf:"bytes,4,opt,name=field18862" json:"field18862,omitempty"`
+	Field18863 *string  `protobuf:"bytes,5,opt,name=field18863" json:"field18863,omitempty"`
+	Field18864 *string  `protobuf:"bytes,17,opt,name=field18864" json:"field18864,omitempty"`
+	Field18865 *string  `protobuf:"bytes,6,opt,name=field18865" json:"field18865,omitempty"`
+	Field18866 *string  `protobuf:"bytes,7,opt,name=field18866" json:"field18866,omitempty"`
+	Field18867 *string  `protobuf:"bytes,8,opt,name=field18867" json:"field18867,omitempty"`
+	Field18868 *string  `protobuf:"bytes,9,opt,name=field18868" json:"field18868,omitempty"`
+	Field18869 *string  `protobuf:"bytes,10,opt,name=field18869" json:"field18869,omitempty"`
+	Field18870 *string  `protobuf:"bytes,11,opt,name=field18870" json:"field18870,omitempty"`
+	Field18871 *string  `protobuf:"bytes,21,opt,name=field18871" json:"field18871,omitempty"`
+	Field18872 *string  `protobuf:"bytes,18,opt,name=field18872" json:"field18872,omitempty"`
+	Field18873 *string  `protobuf:"bytes,19,opt,name=field18873" json:"field18873,omitempty"`
+	Field18874 *string  `protobuf:"bytes,20,opt,name=field18874" json:"field18874,omitempty"`
+	Field18875 *string  `protobuf:"bytes,22,opt,name=field18875" json:"field18875,omitempty"`
+	Field18876 *string  `protobuf:"bytes,23,opt,name=field18876" json:"field18876,omitempty"`
+	Field18877 *string  `protobuf:"bytes,24,opt,name=field18877" json:"field18877,omitempty"`
+	Field18878 *string  `protobuf:"bytes,25,opt,name=field18878" json:"field18878,omitempty"`
+	Field18879 *string  `protobuf:"bytes,12,opt,name=field18879" json:"field18879,omitempty"`
+	Field18880 *string  `protobuf:"bytes,13,opt,name=field18880" json:"field18880,omitempty"`
+	Field18881 *string  `protobuf:"bytes,29,opt,name=field18881" json:"field18881,omitempty"`
+	Field18882 *string  `protobuf:"bytes,30,opt,name=field18882" json:"field18882,omitempty"`
+	Field18883 *string  `protobuf:"bytes,15,opt,name=field18883" json:"field18883,omitempty"`
+	Field18884 *string  `protobuf:"bytes,16,opt,name=field18884" json:"field18884,omitempty"`
+	Field18885 []string `protobuf:"bytes,14,rep,name=field18885" json:"field18885,omitempty"`
+	Field18886 *string  `protobuf:"bytes,27,opt,name=field18886" json:"field18886,omitempty"`
+	Field18887 *string  `protobuf:"bytes,28,opt,name=field18887" json:"field18887,omitempty"`
 }
 
 func (x *Message18856) Reset() {
@@ -2745,12 +2769,13 @@ type Message3850 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3924     *Enum3851 `protobuf:"varint,2,opt,name=field3924,enum=benchmarks.google_message3.Enum3851" json:"field3924,omitempty"`
-	Field3925     *bool     `protobuf:"varint,12,opt,name=field3925" json:"field3925,omitempty"`
-	Field3926     *int32    `protobuf:"varint,4,opt,name=field3926" json:"field3926,omitempty"`
-	Field3927     *bool     `protobuf:"varint,10,opt,name=field3927" json:"field3927,omitempty"`
-	Field3928     *bool     `protobuf:"varint,13,opt,name=field3928" json:"field3928,omitempty"`
-	Field3929     *bool     `protobuf:"varint,14,opt,name=field3929" json:"field3929,omitempty"`
+
+	Field3924 *Enum3851 `protobuf:"varint,2,opt,name=field3924,enum=benchmarks.google_message3.Enum3851" json:"field3924,omitempty"`
+	Field3925 *bool     `protobuf:"varint,12,opt,name=field3925" json:"field3925,omitempty"`
+	Field3926 *int32    `protobuf:"varint,4,opt,name=field3926" json:"field3926,omitempty"`
+	Field3927 *bool     `protobuf:"varint,10,opt,name=field3927" json:"field3927,omitempty"`
+	Field3928 *bool     `protobuf:"varint,13,opt,name=field3928" json:"field3928,omitempty"`
+	Field3929 *bool     `protobuf:"varint,14,opt,name=field3929" json:"field3929,omitempty"`
 }
 
 func (x *Message3850) Reset() {
@@ -2826,10 +2851,11 @@ type Message6721 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6744     *Message6722 `protobuf:"bytes,1,opt,name=field6744" json:"field6744,omitempty"`
-	Field6745     *bool        `protobuf:"varint,2,opt,name=field6745" json:"field6745,omitempty"`
-	Field6746     *bool        `protobuf:"varint,3,opt,name=field6746" json:"field6746,omitempty"`
-	Field6747     *bool        `protobuf:"varint,4,opt,name=field6747" json:"field6747,omitempty"`
+
+	Field6744 *Message6722 `protobuf:"bytes,1,opt,name=field6744" json:"field6744,omitempty"`
+	Field6745 *bool        `protobuf:"varint,2,opt,name=field6745" json:"field6745,omitempty"`
+	Field6746 *bool        `protobuf:"varint,3,opt,name=field6746" json:"field6746,omitempty"`
+	Field6747 *bool        `protobuf:"varint,4,opt,name=field6747" json:"field6747,omitempty"`
 }
 
 func (x *Message6721) Reset() {
@@ -2891,7 +2917,8 @@ type Message6742 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6758     *bool `protobuf:"varint,1,opt,name=field6758" json:"field6758,omitempty"`
+
+	Field6758 *bool `protobuf:"varint,1,opt,name=field6758" json:"field6758,omitempty"`
 }
 
 func (x *Message6742) Reset() {
@@ -2932,8 +2959,9 @@ type Message6726 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6752     *int64         `protobuf:"varint,1,opt,name=field6752" json:"field6752,omitempty"`
-	Field6753     []*Message6727 `protobuf:"bytes,2,rep,name=field6753" json:"field6753,omitempty"`
+
+	Field6752 *int64         `protobuf:"varint,1,opt,name=field6752" json:"field6752,omitempty"`
+	Field6753 []*Message6727 `protobuf:"bytes,2,rep,name=field6753" json:"field6753,omitempty"`
 }
 
 func (x *Message6726) Reset() {
@@ -2981,9 +3009,10 @@ type Message6733 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6754     *int64 `protobuf:"varint,1,opt,name=field6754" json:"field6754,omitempty"`
-	Field6755     *int64 `protobuf:"varint,2,opt,name=field6755" json:"field6755,omitempty"`
-	Field6756     *bool  `protobuf:"varint,3,opt,name=field6756" json:"field6756,omitempty"`
+
+	Field6754 *int64 `protobuf:"varint,1,opt,name=field6754" json:"field6754,omitempty"`
+	Field6755 *int64 `protobuf:"varint,2,opt,name=field6755" json:"field6755,omitempty"`
+	Field6756 *bool  `protobuf:"varint,3,opt,name=field6756" json:"field6756,omitempty"`
 }
 
 func (x *Message6733) Reset() {
@@ -3038,8 +3067,9 @@ type Message6723 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6748     *int64         `protobuf:"varint,1,opt,name=field6748" json:"field6748,omitempty"`
-	Field6749     []*Message6724 `protobuf:"bytes,2,rep,name=field6749" json:"field6749,omitempty"`
+
+	Field6748 *int64         `protobuf:"varint,1,opt,name=field6748" json:"field6748,omitempty"`
+	Field6749 []*Message6724 `protobuf:"bytes,2,rep,name=field6749" json:"field6749,omitempty"`
 }
 
 func (x *Message6723) Reset() {
@@ -3087,8 +3117,9 @@ type Message6725 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6750     *int32 `protobuf:"varint,1,opt,name=field6750" json:"field6750,omitempty"`
-	Field6751     *int32 `protobuf:"varint,2,opt,name=field6751" json:"field6751,omitempty"`
+
+	Field6750 *int32 `protobuf:"varint,1,opt,name=field6750" json:"field6750,omitempty"`
+	Field6751 *int32 `protobuf:"varint,2,opt,name=field6751" json:"field6751,omitempty"`
 }
 
 func (x *Message6725) Reset() {
@@ -3136,7 +3167,8 @@ type Message6734 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6757     []*Message6735 `protobuf:"bytes,1,rep,name=field6757" json:"field6757,omitempty"`
+
+	Field6757 []*Message6735 `protobuf:"bytes,1,rep,name=field6757" json:"field6757,omitempty"`
 }
 
 func (x *Message6734) Reset() {
@@ -3177,9 +3209,10 @@ type Message8184 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8228     *Message7966   `protobuf:"bytes,1,opt,name=field8228" json:"field8228,omitempty"`
-	Field8229     *bool          `protobuf:"varint,2,opt,name=field8229" json:"field8229,omitempty"`
-	Field8230     []*Message8183 `protobuf:"bytes,3,rep,name=field8230" json:"field8230,omitempty"`
+
+	Field8228 *Message7966   `protobuf:"bytes,1,opt,name=field8228" json:"field8228,omitempty"`
+	Field8229 *bool          `protobuf:"varint,2,opt,name=field8229" json:"field8229,omitempty"`
+	Field8230 []*Message8183 `protobuf:"bytes,3,rep,name=field8230" json:"field8230,omitempty"`
 }
 
 func (x *Message8184) Reset() {
@@ -3234,9 +3267,10 @@ type Message8477 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8486     *Message7966 `protobuf:"bytes,1,opt,name=field8486" json:"field8486,omitempty"`
-	Field8487     *int64       `protobuf:"varint,2,opt,name=field8487" json:"field8487,omitempty"`
-	Field8488     *string      `protobuf:"bytes,3,opt,name=field8488" json:"field8488,omitempty"`
+
+	Field8486 *Message7966 `protobuf:"bytes,1,opt,name=field8486" json:"field8486,omitempty"`
+	Field8487 *int64       `protobuf:"varint,2,opt,name=field8487" json:"field8487,omitempty"`
+	Field8488 *string      `protobuf:"bytes,3,opt,name=field8488" json:"field8488,omitempty"`
 }
 
 func (x *Message8477) Reset() {
@@ -3291,10 +3325,11 @@ type Message8454 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8465     *Message8449 `protobuf:"bytes,1,opt,name=field8465" json:"field8465,omitempty"`
-	Field8466     *int64       `protobuf:"varint,3,opt,name=field8466" json:"field8466,omitempty"`
-	Field8467     *int32       `protobuf:"varint,4,opt,name=field8467" json:"field8467,omitempty"`
-	Field8468     *bool        `protobuf:"varint,5,opt,name=field8468" json:"field8468,omitempty"`
+
+	Field8465 *Message8449 `protobuf:"bytes,1,opt,name=field8465" json:"field8465,omitempty"`
+	Field8466 *int64       `protobuf:"varint,3,opt,name=field8466" json:"field8466,omitempty"`
+	Field8467 *int32       `protobuf:"varint,4,opt,name=field8467" json:"field8467,omitempty"`
+	Field8468 *bool        `protobuf:"varint,5,opt,name=field8468" json:"field8468,omitempty"`
 }
 
 func (x *Message8454) Reset() {
@@ -3356,9 +3391,10 @@ type Message8476 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8483     *string `protobuf:"bytes,1,opt,name=field8483" json:"field8483,omitempty"`
-	Field8484     *string `protobuf:"bytes,2,opt,name=field8484" json:"field8484,omitempty"`
-	Field8485     *string `protobuf:"bytes,3,opt,name=field8485" json:"field8485,omitempty"`
+
+	Field8483 *string `protobuf:"bytes,1,opt,name=field8483" json:"field8483,omitempty"`
+	Field8484 *string `protobuf:"bytes,2,opt,name=field8484" json:"field8484,omitempty"`
+	Field8485 *string `protobuf:"bytes,3,opt,name=field8485" json:"field8485,omitempty"`
 }
 
 func (x *Message8476) Reset() {
@@ -3413,10 +3449,11 @@ type Message8455 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8470     *Message8449        `protobuf:"bytes,1,opt,name=field8470" json:"field8470,omitempty"`
-	Field8471     []*Message8456      `protobuf:"bytes,2,rep,name=field8471" json:"field8471,omitempty"`
-	Field8472     *Message8457        `protobuf:"bytes,5,opt,name=field8472" json:"field8472,omitempty"`
-	Field8473     *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field8473" json:"field8473,omitempty"`
+
+	Field8470 *Message8449        `protobuf:"bytes,1,opt,name=field8470" json:"field8470,omitempty"`
+	Field8471 []*Message8456      `protobuf:"bytes,2,rep,name=field8471" json:"field8471,omitempty"`
+	Field8472 *Message8457        `protobuf:"bytes,5,opt,name=field8472" json:"field8472,omitempty"`
+	Field8473 *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field8473" json:"field8473,omitempty"`
 }
 
 func (x *Message8455) Reset() {
@@ -3478,8 +3515,9 @@ type Message8475 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8481     *string `protobuf:"bytes,1,opt,name=field8481" json:"field8481,omitempty"`
-	Field8482     *int64  `protobuf:"varint,2,opt,name=field8482" json:"field8482,omitempty"`
+
+	Field8481 *string `protobuf:"bytes,1,opt,name=field8481" json:"field8481,omitempty"`
+	Field8482 *int64  `protobuf:"varint,2,opt,name=field8482" json:"field8482,omitempty"`
 }
 
 func (x *Message8475) Reset() {
@@ -3560,9 +3598,10 @@ type Message12817 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12826    *int32 `protobuf:"varint,1,opt,name=field12826" json:"field12826,omitempty"`
-	Field12827    *int32 `protobuf:"varint,2,opt,name=field12827" json:"field12827,omitempty"`
-	Field12828    *int32 `protobuf:"varint,3,opt,name=field12828" json:"field12828,omitempty"`
+
+	Field12826 *int32 `protobuf:"varint,1,opt,name=field12826" json:"field12826,omitempty"`
+	Field12827 *int32 `protobuf:"varint,2,opt,name=field12827" json:"field12827,omitempty"`
+	Field12828 *int32 `protobuf:"varint,3,opt,name=field12828" json:"field12828,omitempty"`
 }
 
 func (x *Message12817) Reset() {
@@ -3617,15 +3656,16 @@ type Message16480 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field16490    *Message13358 `protobuf:"bytes,1,opt,name=field16490" json:"field16490,omitempty"`
-	Field16491    *Enum16042    `protobuf:"varint,2,opt,name=field16491,enum=benchmarks.google_message3.Enum16042" json:"field16491,omitempty"`
-	Field16492    *Message13912 `protobuf:"bytes,3,opt,name=field16492" json:"field16492,omitempty"`
-	Field16493    *string       `protobuf:"bytes,4,opt,name=field16493" json:"field16493,omitempty"`
-	Field16494    *string       `protobuf:"bytes,5,opt,name=field16494" json:"field16494,omitempty"`
-	Field16495    *string       `protobuf:"bytes,6,opt,name=field16495" json:"field16495,omitempty"`
-	Field16496    *string       `protobuf:"bytes,7,opt,name=field16496" json:"field16496,omitempty"`
-	Field16497    *Message13358 `protobuf:"bytes,8,opt,name=field16497" json:"field16497,omitempty"`
-	Field16498    *uint32       `protobuf:"fixed32,9,opt,name=field16498" json:"field16498,omitempty"`
+
+	Field16490 *Message13358 `protobuf:"bytes,1,opt,name=field16490" json:"field16490,omitempty"`
+	Field16491 *Enum16042    `protobuf:"varint,2,opt,name=field16491,enum=benchmarks.google_message3.Enum16042" json:"field16491,omitempty"`
+	Field16492 *Message13912 `protobuf:"bytes,3,opt,name=field16492" json:"field16492,omitempty"`
+	Field16493 *string       `protobuf:"bytes,4,opt,name=field16493" json:"field16493,omitempty"`
+	Field16494 *string       `protobuf:"bytes,5,opt,name=field16494" json:"field16494,omitempty"`
+	Field16495 *string       `protobuf:"bytes,6,opt,name=field16495" json:"field16495,omitempty"`
+	Field16496 *string       `protobuf:"bytes,7,opt,name=field16496" json:"field16496,omitempty"`
+	Field16497 *Message13358 `protobuf:"bytes,8,opt,name=field16497" json:"field16497,omitempty"`
+	Field16498 *uint32       `protobuf:"fixed32,9,opt,name=field16498" json:"field16498,omitempty"`
 }
 
 func (x *Message16480) Reset() {
@@ -3722,35 +3762,36 @@ type Message24317 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24446    *string               `protobuf:"bytes,1,opt,name=field24446" json:"field24446,omitempty"`
-	Field24447    *Message24312         `protobuf:"bytes,2,opt,name=field24447" json:"field24447,omitempty"`
-	Field24448    []*Message24315       `protobuf:"bytes,3,rep,name=field24448" json:"field24448,omitempty"`
-	Field24449    []*Message24313       `protobuf:"bytes,4,rep,name=field24449" json:"field24449,omitempty"`
-	Field24450    []*Message24316       `protobuf:"bytes,5,rep,name=field24450" json:"field24450,omitempty"`
-	Field24451    []*UnusedEmptyMessage `protobuf:"bytes,6,rep,name=field24451" json:"field24451,omitempty"`
-	Field24452    *UnusedEmptyMessage   `protobuf:"bytes,7,opt,name=field24452" json:"field24452,omitempty"`
-	Field24453    []string              `protobuf:"bytes,8,rep,name=field24453" json:"field24453,omitempty"`
-	Field24454    []string              `protobuf:"bytes,9,rep,name=field24454" json:"field24454,omitempty"`
-	Field24455    []string              `protobuf:"bytes,10,rep,name=field24455" json:"field24455,omitempty"`
-	Field24456    []string              `protobuf:"bytes,28,rep,name=field24456" json:"field24456,omitempty"`
-	Field24457    *string               `protobuf:"bytes,11,opt,name=field24457" json:"field24457,omitempty"`
-	Field24458    *string               `protobuf:"bytes,12,opt,name=field24458" json:"field24458,omitempty"`
-	Field24459    *string               `protobuf:"bytes,13,opt,name=field24459" json:"field24459,omitempty"`
-	Field24460    *string               `protobuf:"bytes,14,opt,name=field24460" json:"field24460,omitempty"`
-	Field24461    []string              `protobuf:"bytes,15,rep,name=field24461" json:"field24461,omitempty"`
-	Field24462    *string               `protobuf:"bytes,16,opt,name=field24462" json:"field24462,omitempty"`
-	Field24463    []string              `protobuf:"bytes,17,rep,name=field24463" json:"field24463,omitempty"`
-	Field24464    []string              `protobuf:"bytes,18,rep,name=field24464" json:"field24464,omitempty"`
-	Field24465    []string              `protobuf:"bytes,19,rep,name=field24465" json:"field24465,omitempty"`
-	Field24466    []string              `protobuf:"bytes,20,rep,name=field24466" json:"field24466,omitempty"`
-	Field24467    []string              `protobuf:"bytes,21,rep,name=field24467" json:"field24467,omitempty"`
-	Field24468    []string              `protobuf:"bytes,22,rep,name=field24468" json:"field24468,omitempty"`
-	Field24469    []string              `protobuf:"bytes,23,rep,name=field24469" json:"field24469,omitempty"`
-	Field24470    []string              `protobuf:"bytes,24,rep,name=field24470" json:"field24470,omitempty"`
-	Field24471    *string               `protobuf:"bytes,25,opt,name=field24471" json:"field24471,omitempty"`
-	Field24472    *string               `protobuf:"bytes,26,opt,name=field24472" json:"field24472,omitempty"`
-	Field24473    []string              `protobuf:"bytes,27,rep,name=field24473" json:"field24473,omitempty"`
-	Field24474    *bool                 `protobuf:"varint,40,opt,name=field24474" json:"field24474,omitempty"`
+
+	Field24446 *string               `protobuf:"bytes,1,opt,name=field24446" json:"field24446,omitempty"`
+	Field24447 *Message24312         `protobuf:"bytes,2,opt,name=field24447" json:"field24447,omitempty"`
+	Field24448 []*Message24315       `protobuf:"bytes,3,rep,name=field24448" json:"field24448,omitempty"`
+	Field24449 []*Message24313       `protobuf:"bytes,4,rep,name=field24449" json:"field24449,omitempty"`
+	Field24450 []*Message24316       `protobuf:"bytes,5,rep,name=field24450" json:"field24450,omitempty"`
+	Field24451 []*UnusedEmptyMessage `protobuf:"bytes,6,rep,name=field24451" json:"field24451,omitempty"`
+	Field24452 *UnusedEmptyMessage   `protobuf:"bytes,7,opt,name=field24452" json:"field24452,omitempty"`
+	Field24453 []string              `protobuf:"bytes,8,rep,name=field24453" json:"field24453,omitempty"`
+	Field24454 []string              `protobuf:"bytes,9,rep,name=field24454" json:"field24454,omitempty"`
+	Field24455 []string              `protobuf:"bytes,10,rep,name=field24455" json:"field24455,omitempty"`
+	Field24456 []string              `protobuf:"bytes,28,rep,name=field24456" json:"field24456,omitempty"`
+	Field24457 *string               `protobuf:"bytes,11,opt,name=field24457" json:"field24457,omitempty"`
+	Field24458 *string               `protobuf:"bytes,12,opt,name=field24458" json:"field24458,omitempty"`
+	Field24459 *string               `protobuf:"bytes,13,opt,name=field24459" json:"field24459,omitempty"`
+	Field24460 *string               `protobuf:"bytes,14,opt,name=field24460" json:"field24460,omitempty"`
+	Field24461 []string              `protobuf:"bytes,15,rep,name=field24461" json:"field24461,omitempty"`
+	Field24462 *string               `protobuf:"bytes,16,opt,name=field24462" json:"field24462,omitempty"`
+	Field24463 []string              `protobuf:"bytes,17,rep,name=field24463" json:"field24463,omitempty"`
+	Field24464 []string              `protobuf:"bytes,18,rep,name=field24464" json:"field24464,omitempty"`
+	Field24465 []string              `protobuf:"bytes,19,rep,name=field24465" json:"field24465,omitempty"`
+	Field24466 []string              `protobuf:"bytes,20,rep,name=field24466" json:"field24466,omitempty"`
+	Field24467 []string              `protobuf:"bytes,21,rep,name=field24467" json:"field24467,omitempty"`
+	Field24468 []string              `protobuf:"bytes,22,rep,name=field24468" json:"field24468,omitempty"`
+	Field24469 []string              `protobuf:"bytes,23,rep,name=field24469" json:"field24469,omitempty"`
+	Field24470 []string              `protobuf:"bytes,24,rep,name=field24470" json:"field24470,omitempty"`
+	Field24471 *string               `protobuf:"bytes,25,opt,name=field24471" json:"field24471,omitempty"`
+	Field24472 *string               `protobuf:"bytes,26,opt,name=field24472" json:"field24472,omitempty"`
+	Field24473 []string              `protobuf:"bytes,27,rep,name=field24473" json:"field24473,omitempty"`
+	Field24474 *bool                 `protobuf:"varint,40,opt,name=field24474" json:"field24474,omitempty"`
 }
 
 func (x *Message24317) Reset() {
@@ -3987,12 +4028,13 @@ type Message33958_Message33959 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field33982    *string   `protobuf:"bytes,3,req,name=field33982" json:"field33982,omitempty"`
-	Field33983    *string   `protobuf:"bytes,4,opt,name=field33983" json:"field33983,omitempty"`
-	Field33984    *string   `protobuf:"bytes,5,opt,name=field33984" json:"field33984,omitempty"`
-	Field33985    *uint64   `protobuf:"fixed64,8,opt,name=field33985" json:"field33985,omitempty"`
-	Field33986    *bool     `protobuf:"varint,10,opt,name=field33986" json:"field33986,omitempty"`
-	Field33987    *Message0 `protobuf:"bytes,6,opt,name=field33987" json:"field33987,omitempty"`
+
+	Field33982 *string   `protobuf:"bytes,3,req,name=field33982" json:"field33982,omitempty"`
+	Field33983 *string   `protobuf:"bytes,4,opt,name=field33983" json:"field33983,omitempty"`
+	Field33984 *string   `protobuf:"bytes,5,opt,name=field33984" json:"field33984,omitempty"`
+	Field33985 *uint64   `protobuf:"fixed64,8,opt,name=field33985" json:"field33985,omitempty"`
+	Field33986 *bool     `protobuf:"varint,10,opt,name=field33986" json:"field33986,omitempty"`
+	Field33987 *Message0 `protobuf:"bytes,6,opt,name=field33987" json:"field33987,omitempty"`
 }
 
 func (x *Message33958_Message33959) Reset() {
@@ -4068,10 +4110,11 @@ type Message13083_Message13084 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13107    *float32    `protobuf:"fixed32,3,req,name=field13107" json:"field13107,omitempty"`
-	Field13108    *int32      `protobuf:"varint,4,req,name=field13108" json:"field13108,omitempty"`
-	Field13109    *float32    `protobuf:"fixed32,5,opt,name=field13109" json:"field13109,omitempty"`
-	Field13110    []Enum13092 `protobuf:"varint,6,rep,name=field13110,enum=benchmarks.google_message3.Enum13092" json:"field13110,omitempty"`
+
+	Field13107 *float32    `protobuf:"fixed32,3,req,name=field13107" json:"field13107,omitempty"`
+	Field13108 *int32      `protobuf:"varint,4,req,name=field13108" json:"field13108,omitempty"`
+	Field13109 *float32    `protobuf:"fixed32,5,opt,name=field13109" json:"field13109,omitempty"`
+	Field13110 []Enum13092 `protobuf:"varint,6,rep,name=field13110,enum=benchmarks.google_message3.Enum13092" json:"field13110,omitempty"`
 }
 
 func (x *Message13083_Message13084) Reset() {
@@ -4232,8 +4275,9 @@ type Message13088_Message13089 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13139    *string  `protobuf:"bytes,2,req,name=field13139" json:"field13139,omitempty"`
-	Field13140    *float32 `protobuf:"fixed32,3,opt,name=field13140" json:"field13140,omitempty"`
+
+	Field13139 *string  `protobuf:"bytes,2,req,name=field13139" json:"field13139,omitempty"`
+	Field13140 *float32 `protobuf:"fixed32,3,opt,name=field13140" json:"field13140,omitempty"`
 }
 
 func (x *Message13088_Message13089) Reset() {
@@ -4281,8 +4325,9 @@ type Message18253_Message18254 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field18362    *uint64  `protobuf:"fixed64,2,req,name=field18362" json:"field18362,omitempty"`
-	Field18363    *float64 `protobuf:"fixed64,3,req,name=field18363" json:"field18363,omitempty"`
+
+	Field18362 *uint64  `protobuf:"fixed64,2,req,name=field18362" json:"field18362,omitempty"`
+	Field18363 *float64 `protobuf:"fixed64,3,req,name=field18363" json:"field18363,omitempty"`
 }
 
 func (x *Message18253_Message18254) Reset() {

internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go

@@ -88,11 +88,12 @@ type Message24400 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24674    *int32 `protobuf:"varint,1,opt,name=field24674" json:"field24674,omitempty"`
-	Field24675    *int32 `protobuf:"varint,2,opt,name=field24675" json:"field24675,omitempty"`
-	Field24676    *int32 `protobuf:"varint,3,opt,name=field24676" json:"field24676,omitempty"`
-	Field24677    *int32 `protobuf:"varint,4,opt,name=field24677" json:"field24677,omitempty"`
-	Field24678    *int32 `protobuf:"varint,5,opt,name=field24678" json:"field24678,omitempty"`
+
+	Field24674 *int32 `protobuf:"varint,1,opt,name=field24674" json:"field24674,omitempty"`
+	Field24675 *int32 `protobuf:"varint,2,opt,name=field24675" json:"field24675,omitempty"`
+	Field24676 *int32 `protobuf:"varint,3,opt,name=field24676" json:"field24676,omitempty"`
+	Field24677 *int32 `protobuf:"varint,4,opt,name=field24677" json:"field24677,omitempty"`
+	Field24678 *int32 `protobuf:"varint,5,opt,name=field24678" json:"field24678,omitempty"`
 }
 
 func (x *Message24400) Reset() {
@@ -227,10 +228,11 @@ type Message719 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field881      []string `protobuf:"bytes,1,rep,name=field881" json:"field881,omitempty"`
-	Field882      []string `protobuf:"bytes,2,rep,name=field882" json:"field882,omitempty"`
-	Field883      []string `protobuf:"bytes,3,rep,name=field883" json:"field883,omitempty"`
-	Field884      *Enum720 `protobuf:"varint,4,opt,name=field884,enum=benchmarks.google_message3.Enum720" json:"field884,omitempty"`
+
+	Field881 []string `protobuf:"bytes,1,rep,name=field881" json:"field881,omitempty"`
+	Field882 []string `protobuf:"bytes,2,rep,name=field882" json:"field882,omitempty"`
+	Field883 []string `protobuf:"bytes,3,rep,name=field883" json:"field883,omitempty"`
+	Field884 *Enum720 `protobuf:"varint,4,opt,name=field884,enum=benchmarks.google_message3.Enum720" json:"field884,omitempty"`
 }
 
 func (x *Message719) Reset() {
@@ -293,15 +295,16 @@ type Message728 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field887        *string       `protobuf:"bytes,1,req,name=field887" json:"field887,omitempty"`
-	Field888        []string      `protobuf:"bytes,2,rep,name=field888" json:"field888,omitempty"`
-	Field889        []*Message703 `protobuf:"bytes,3,rep,name=field889" json:"field889,omitempty"`
-	Field890        []*Message715 `protobuf:"bytes,4,rep,name=field890" json:"field890,omitempty"`
-	Field891        []string      `protobuf:"bytes,5,rep,name=field891" json:"field891,omitempty"`
-	Field892        []string      `protobuf:"bytes,6,rep,name=field892" json:"field892,omitempty"`
-	Field893        *Message718   `protobuf:"bytes,7,opt,name=field893" json:"field893,omitempty"`
-	Field894        *Message716   `protobuf:"bytes,8,opt,name=field894" json:"field894,omitempty"`
-	Field895        []string      `protobuf:"bytes,9,rep,name=field895" json:"field895,omitempty"`
+
+	Field887 *string       `protobuf:"bytes,1,req,name=field887" json:"field887,omitempty"`
+	Field888 []string      `protobuf:"bytes,2,rep,name=field888" json:"field888,omitempty"`
+	Field889 []*Message703 `protobuf:"bytes,3,rep,name=field889" json:"field889,omitempty"`
+	Field890 []*Message715 `protobuf:"bytes,4,rep,name=field890" json:"field890,omitempty"`
+	Field891 []string      `protobuf:"bytes,5,rep,name=field891" json:"field891,omitempty"`
+	Field892 []string      `protobuf:"bytes,6,rep,name=field892" json:"field892,omitempty"`
+	Field893 *Message718   `protobuf:"bytes,7,opt,name=field893" json:"field893,omitempty"`
+	Field894 *Message716   `protobuf:"bytes,8,opt,name=field894" json:"field894,omitempty"`
+	Field895 []string      `protobuf:"bytes,9,rep,name=field895" json:"field895,omitempty"`
 }
 
 func (x *Message728) Reset() {
@@ -409,13 +412,14 @@ type Message704 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field800      *string             `protobuf:"bytes,1,opt,name=field800" json:"field800,omitempty"`
-	Field801      *string             `protobuf:"bytes,7,opt,name=field801" json:"field801,omitempty"`
-	Field802      *string             `protobuf:"bytes,2,opt,name=field802" json:"field802,omitempty"`
-	Field803      *string             `protobuf:"bytes,3,opt,name=field803" json:"field803,omitempty"`
-	Field804      *string             `protobuf:"bytes,4,opt,name=field804" json:"field804,omitempty"`
-	Field805      *string             `protobuf:"bytes,5,opt,name=field805" json:"field805,omitempty"`
-	Field806      *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field806" json:"field806,omitempty"`
+
+	Field800 *string             `protobuf:"bytes,1,opt,name=field800" json:"field800,omitempty"`
+	Field801 *string             `protobuf:"bytes,7,opt,name=field801" json:"field801,omitempty"`
+	Field802 *string             `protobuf:"bytes,2,opt,name=field802" json:"field802,omitempty"`
+	Field803 *string             `protobuf:"bytes,3,opt,name=field803" json:"field803,omitempty"`
+	Field804 *string             `protobuf:"bytes,4,opt,name=field804" json:"field804,omitempty"`
+	Field805 *string             `protobuf:"bytes,5,opt,name=field805" json:"field805,omitempty"`
+	Field806 *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field806" json:"field806,omitempty"`
 }
 
 func (x *Message704) Reset() {
@@ -499,42 +503,43 @@ type Message697 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field743        *string       `protobuf:"bytes,7,opt,name=field743" json:"field743,omitempty"`
-	Field744        []string      `protobuf:"bytes,1,rep,name=field744" json:"field744,omitempty"`
-	Field745        []string      `protobuf:"bytes,2,rep,name=field745" json:"field745,omitempty"`
-	Field746        []string      `protobuf:"bytes,33,rep,name=field746" json:"field746,omitempty"`
-	Field747        []string      `protobuf:"bytes,29,rep,name=field747" json:"field747,omitempty"`
-	Field748        []string      `protobuf:"bytes,30,rep,name=field748" json:"field748,omitempty"`
-	Field749        []string      `protobuf:"bytes,31,rep,name=field749" json:"field749,omitempty"`
-	Field750        []string      `protobuf:"bytes,32,rep,name=field750" json:"field750,omitempty"`
-	Field751        []string      `protobuf:"bytes,13,rep,name=field751" json:"field751,omitempty"`
-	Field752        []string      `protobuf:"bytes,6,rep,name=field752" json:"field752,omitempty"`
-	Field753        []string      `protobuf:"bytes,3,rep,name=field753" json:"field753,omitempty"`
-	Field754        []string      `protobuf:"bytes,14,rep,name=field754" json:"field754,omitempty"`
-	Field755        []string      `protobuf:"bytes,15,rep,name=field755" json:"field755,omitempty"`
-	Field756        []string      `protobuf:"bytes,16,rep,name=field756" json:"field756,omitempty"`
-	Field757        []string      `protobuf:"bytes,4,rep,name=field757" json:"field757,omitempty"`
-	Field758        []string      `protobuf:"bytes,34,rep,name=field758" json:"field758,omitempty"`
-	Field759        []string      `protobuf:"bytes,35,rep,name=field759" json:"field759,omitempty"`
-	Field760        []string      `protobuf:"bytes,5,rep,name=field760" json:"field760,omitempty"`
-	Field761        []string      `protobuf:"bytes,17,rep,name=field761" json:"field761,omitempty"`
-	Field762        []string      `protobuf:"bytes,18,rep,name=field762" json:"field762,omitempty"`
-	Field763        []string      `protobuf:"bytes,19,rep,name=field763" json:"field763,omitempty"`
-	Field764        *bool         `protobuf:"varint,36,opt,name=field764" json:"field764,omitempty"`
-	Field765        []string      `protobuf:"bytes,8,rep,name=field765" json:"field765,omitempty"`
-	Field766        []string      `protobuf:"bytes,9,rep,name=field766" json:"field766,omitempty"`
-	Field767        *string       `protobuf:"bytes,27,opt,name=field767" json:"field767,omitempty"`
-	Field768        *bool         `protobuf:"varint,25,opt,name=field768" json:"field768,omitempty"`
-	Field769        *Message700   `protobuf:"bytes,10,opt,name=field769" json:"field769,omitempty"`
-	Field770        *bool         `protobuf:"varint,11,opt,name=field770" json:"field770,omitempty"`
-	Field771        *bool         `protobuf:"varint,24,opt,name=field771" json:"field771,omitempty"`
-	Field772        []string      `protobuf:"bytes,12,rep,name=field772" json:"field772,omitempty"`
-	Field773        []string      `protobuf:"bytes,20,rep,name=field773" json:"field773,omitempty"`
-	Field774        []string      `protobuf:"bytes,21,rep,name=field774" json:"field774,omitempty"`
-	Field775        []string      `protobuf:"bytes,22,rep,name=field775" json:"field775,omitempty"`
-	Field776        []*Message699 `protobuf:"bytes,23,rep,name=field776" json:"field776,omitempty"`
-	Field777        []*Message698 `protobuf:"bytes,37,rep,name=field777" json:"field777,omitempty"`
-	Field778        *int64        `protobuf:"varint,38,opt,name=field778" json:"field778,omitempty"`
+
+	Field743 *string       `protobuf:"bytes,7,opt,name=field743" json:"field743,omitempty"`
+	Field744 []string      `protobuf:"bytes,1,rep,name=field744" json:"field744,omitempty"`
+	Field745 []string      `protobuf:"bytes,2,rep,name=field745" json:"field745,omitempty"`
+	Field746 []string      `protobuf:"bytes,33,rep,name=field746" json:"field746,omitempty"`
+	Field747 []string      `protobuf:"bytes,29,rep,name=field747" json:"field747,omitempty"`
+	Field748 []string      `protobuf:"bytes,30,rep,name=field748" json:"field748,omitempty"`
+	Field749 []string      `protobuf:"bytes,31,rep,name=field749" json:"field749,omitempty"`
+	Field750 []string      `protobuf:"bytes,32,rep,name=field750" json:"field750,omitempty"`
+	Field751 []string      `protobuf:"bytes,13,rep,name=field751" json:"field751,omitempty"`
+	Field752 []string      `protobuf:"bytes,6,rep,name=field752" json:"field752,omitempty"`
+	Field753 []string      `protobuf:"bytes,3,rep,name=field753" json:"field753,omitempty"`
+	Field754 []string      `protobuf:"bytes,14,rep,name=field754" json:"field754,omitempty"`
+	Field755 []string      `protobuf:"bytes,15,rep,name=field755" json:"field755,omitempty"`
+	Field756 []string      `protobuf:"bytes,16,rep,name=field756" json:"field756,omitempty"`
+	Field757 []string      `protobuf:"bytes,4,rep,name=field757" json:"field757,omitempty"`
+	Field758 []string      `protobuf:"bytes,34,rep,name=field758" json:"field758,omitempty"`
+	Field759 []string      `protobuf:"bytes,35,rep,name=field759" json:"field759,omitempty"`
+	Field760 []string      `protobuf:"bytes,5,rep,name=field760" json:"field760,omitempty"`
+	Field761 []string      `protobuf:"bytes,17,rep,name=field761" json:"field761,omitempty"`
+	Field762 []string      `protobuf:"bytes,18,rep,name=field762" json:"field762,omitempty"`
+	Field763 []string      `protobuf:"bytes,19,rep,name=field763" json:"field763,omitempty"`
+	Field764 *bool         `protobuf:"varint,36,opt,name=field764" json:"field764,omitempty"`
+	Field765 []string      `protobuf:"bytes,8,rep,name=field765" json:"field765,omitempty"`
+	Field766 []string      `protobuf:"bytes,9,rep,name=field766" json:"field766,omitempty"`
+	Field767 *string       `protobuf:"bytes,27,opt,name=field767" json:"field767,omitempty"`
+	Field768 *bool         `protobuf:"varint,25,opt,name=field768" json:"field768,omitempty"`
+	Field769 *Message700   `protobuf:"bytes,10,opt,name=field769" json:"field769,omitempty"`
+	Field770 *bool         `protobuf:"varint,11,opt,name=field770" json:"field770,omitempty"`
+	Field771 *bool         `protobuf:"varint,24,opt,name=field771" json:"field771,omitempty"`
+	Field772 []string      `protobuf:"bytes,12,rep,name=field772" json:"field772,omitempty"`
+	Field773 []string      `protobuf:"bytes,20,rep,name=field773" json:"field773,omitempty"`
+	Field774 []string      `protobuf:"bytes,21,rep,name=field774" json:"field774,omitempty"`
+	Field775 []string      `protobuf:"bytes,22,rep,name=field775" json:"field775,omitempty"`
+	Field776 []*Message699 `protobuf:"bytes,23,rep,name=field776" json:"field776,omitempty"`
+	Field777 []*Message698 `protobuf:"bytes,37,rep,name=field777" json:"field777,omitempty"`
+	Field778 *int64        `protobuf:"varint,38,opt,name=field778" json:"field778,omitempty"`
 }
 
 func (x *Message697) Reset() {
@@ -873,8 +878,9 @@ type Message6578 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6632     *Enum6579 `protobuf:"varint,1,opt,name=field6632,enum=benchmarks.google_message3.Enum6579" json:"field6632,omitempty"`
-	Field6633     *Enum6588 `protobuf:"varint,2,opt,name=field6633,enum=benchmarks.google_message3.Enum6588" json:"field6633,omitempty"`
+
+	Field6632 *Enum6579 `protobuf:"varint,1,opt,name=field6632,enum=benchmarks.google_message3.Enum6579" json:"field6632,omitempty"`
+	Field6633 *Enum6588 `protobuf:"varint,2,opt,name=field6633,enum=benchmarks.google_message3.Enum6588" json:"field6633,omitempty"`
 }
 
 func (x *Message6578) Reset() {
@@ -922,9 +928,10 @@ type Message6024 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6048     *Enum6025           `protobuf:"varint,1,opt,name=field6048,enum=benchmarks.google_message3.Enum6025" json:"field6048,omitempty"`
-	Field6049     *string             `protobuf:"bytes,2,opt,name=field6049" json:"field6049,omitempty"`
-	Field6050     *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field6050" json:"field6050,omitempty"`
+
+	Field6048 *Enum6025           `protobuf:"varint,1,opt,name=field6048,enum=benchmarks.google_message3.Enum6025" json:"field6048,omitempty"`
+	Field6049 *string             `protobuf:"bytes,2,opt,name=field6049" json:"field6049,omitempty"`
+	Field6050 *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field6050" json:"field6050,omitempty"`
 }
 
 func (x *Message6024) Reset() {
@@ -979,8 +986,9 @@ type Message6052 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6084     *string `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
-	Field6085     []byte  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
+
+	Field6084 *string `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
+	Field6085 []byte  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
 }
 
 func (x *Message6052) Reset() {
@@ -1028,8 +1036,9 @@ type Message6054 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6089     *string `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
-	Field6090     *string `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
+
+	Field6089 *string `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
+	Field6090 *string `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
 }
 
 func (x *Message6054) Reset() {
@@ -1078,8 +1087,9 @@ type Message10573 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field10580      []*Message10576 `protobuf:"bytes,1,rep,name=field10580" json:"field10580,omitempty"`
-	Field10581      *string         `protobuf:"bytes,2,opt,name=field10581" json:"field10581,omitempty"`
+
+	Field10580 []*Message10576 `protobuf:"bytes,1,rep,name=field10580" json:"field10580,omitempty"`
+	Field10581 *string         `protobuf:"bytes,2,opt,name=field10581" json:"field10581,omitempty"`
 }
 
 func (x *Message10573) Reset() {
@@ -1136,8 +1146,9 @@ type Message10824 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10825    *string `protobuf:"bytes,1,req,name=field10825" json:"field10825,omitempty"`
-	Field10826    *int32  `protobuf:"varint,2,opt,name=field10826" json:"field10826,omitempty"`
+
+	Field10825 *string `protobuf:"bytes,1,req,name=field10825" json:"field10825,omitempty"`
+	Field10826 *int32  `protobuf:"varint,2,opt,name=field10826" json:"field10826,omitempty"`
 }
 
 func (x *Message10824) Reset() {
@@ -1185,12 +1196,13 @@ type Message10582 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10583    *bool    `protobuf:"varint,1,req,name=field10583" json:"field10583,omitempty"`
-	Field10584    *float64 `protobuf:"fixed64,2,req,name=field10584" json:"field10584,omitempty"`
-	Field10585    *bool    `protobuf:"varint,3,opt,name=field10585" json:"field10585,omitempty"`
-	Field10586    *float64 `protobuf:"fixed64,4,opt,name=field10586" json:"field10586,omitempty"`
-	Field10587    *float64 `protobuf:"fixed64,5,opt,name=field10587" json:"field10587,omitempty"`
-	Field10588    *bool    `protobuf:"varint,6,opt,name=field10588" json:"field10588,omitempty"`
+
+	Field10583 *bool    `protobuf:"varint,1,req,name=field10583" json:"field10583,omitempty"`
+	Field10584 *float64 `protobuf:"fixed64,2,req,name=field10584" json:"field10584,omitempty"`
+	Field10585 *bool    `protobuf:"varint,3,opt,name=field10585" json:"field10585,omitempty"`
+	Field10586 *float64 `protobuf:"fixed64,4,opt,name=field10586" json:"field10586,omitempty"`
+	Field10587 *float64 `protobuf:"fixed64,5,opt,name=field10587" json:"field10587,omitempty"`
+	Field10588 *bool    `protobuf:"varint,6,opt,name=field10588" json:"field10588,omitempty"`
 }
 
 func (x *Message10582) Reset() {
@@ -1267,76 +1279,77 @@ type Message10155 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field10195      *int32                       `protobuf:"varint,1,req,name=field10195" json:"field10195,omitempty"`
-	Field10196      *int32                       `protobuf:"varint,2,req,name=field10196" json:"field10196,omitempty"`
-	Field10197      *Enum10157                   `protobuf:"varint,59,opt,name=field10197,enum=benchmarks.google_message3.Enum10157" json:"field10197,omitempty"`
-	Field10198      *int32                       `protobuf:"varint,18,opt,name=field10198" json:"field10198,omitempty"`
-	Field10199      *int32                       `protobuf:"varint,19,opt,name=field10199" json:"field10199,omitempty"`
-	Field10200      *int32                       `protobuf:"varint,21,opt,name=field10200" json:"field10200,omitempty"`
-	Message10156    []*Message10155_Message10156 `protobuf:"group,50,rep,name=Message10156,json=message10156" json:"message10156,omitempty"`
-	Field10202      *int32                       `protobuf:"varint,3,opt,name=field10202" json:"field10202,omitempty"`
-	Field10203      *int32                       `protobuf:"varint,4,opt,name=field10203" json:"field10203,omitempty"`
-	Field10204      *int32                       `protobuf:"varint,5,opt,name=field10204" json:"field10204,omitempty"`
-	Field10205      *bool                        `protobuf:"varint,84,opt,name=field10205" json:"field10205,omitempty"`
-	Field10206      *bool                        `protobuf:"varint,33,opt,name=field10206" json:"field10206,omitempty"`
-	Field10207      *int32                       `protobuf:"varint,75,opt,name=field10207" json:"field10207,omitempty"`
-	Field10208      *float32                     `protobuf:"fixed32,26,opt,name=field10208" json:"field10208,omitempty"`
-	Field10209      *int32                       `protobuf:"varint,27,opt,name=field10209" json:"field10209,omitempty"`
-	Field10210      *int32                       `protobuf:"varint,49,opt,name=field10210" json:"field10210,omitempty"`
-	Field10211      *int32                       `protobuf:"varint,10,opt,name=field10211" json:"field10211,omitempty"`
-	Field10212      *float32                     `protobuf:"fixed32,78,opt,name=field10212" json:"field10212,omitempty"`
-	Field10213      *Message9151                 `protobuf:"bytes,91,opt,name=field10213" json:"field10213,omitempty"`
-	Field10214      *int32                       `protobuf:"varint,11,opt,name=field10214" json:"field10214,omitempty"`
-	Field10215      *int32                       `protobuf:"varint,12,opt,name=field10215" json:"field10215,omitempty"`
-	Field10216      *float32                     `protobuf:"fixed32,41,opt,name=field10216" json:"field10216,omitempty"`
-	Field10217      *Message10154                `protobuf:"bytes,61,opt,name=field10217" json:"field10217,omitempty"`
-	Field10218      *int32                       `protobuf:"varint,23,opt,name=field10218" json:"field10218,omitempty"`
-	Field10219      []byte                       `protobuf:"bytes,24,opt,name=field10219" json:"field10219,omitempty"`
-	Field10220      *int32                       `protobuf:"varint,65,opt,name=field10220" json:"field10220,omitempty"`
-	Field10221      [][]byte                     `protobuf:"bytes,66,rep,name=field10221" json:"field10221,omitempty"`
-	Field10222      *int32                       `protobuf:"varint,70,opt,name=field10222" json:"field10222,omitempty"`
-	Field10223      []byte                       `protobuf:"bytes,71,opt,name=field10223" json:"field10223,omitempty"`
-	Field10224      []uint64                     `protobuf:"fixed64,73,rep,name=field10224" json:"field10224,omitempty"`
-	Field10225      *float32                     `protobuf:"fixed32,29,opt,name=field10225" json:"field10225,omitempty"`
-	Field10226      *int32                       `protobuf:"varint,30,opt,name=field10226" json:"field10226,omitempty"`
-	Field10227      *float32                     `protobuf:"fixed32,31,opt,name=field10227" json:"field10227,omitempty"`
-	Field10228      *int32                       `protobuf:"varint,32,opt,name=field10228" json:"field10228,omitempty"`
-	Field10229      *float32                     `protobuf:"fixed32,34,opt,name=field10229" json:"field10229,omitempty"`
-	Field10230      *int32                       `protobuf:"varint,35,opt,name=field10230" json:"field10230,omitempty"`
-	Field10231      *string                      `protobuf:"bytes,22,opt,name=field10231" json:"field10231,omitempty"`
-	Field10232      *uint64                      `protobuf:"fixed64,13,opt,name=field10232" json:"field10232,omitempty"`
-	Field10233      *uint64                      `protobuf:"fixed64,20,opt,name=field10233" json:"field10233,omitempty"`
-	Field10234      *bool                        `protobuf:"varint,79,opt,name=field10234" json:"field10234,omitempty"`
-	Field10235      []Enum10167                  `protobuf:"varint,80,rep,packed,name=field10235,enum=benchmarks.google_message3.Enum10167" json:"field10235,omitempty"`
-	Field10236      *int32                       `protobuf:"varint,14,opt,name=field10236" json:"field10236,omitempty"`
-	Field10237      *int32                       `protobuf:"varint,15,opt,name=field10237" json:"field10237,omitempty"`
-	Field10238      *int32                       `protobuf:"varint,28,opt,name=field10238" json:"field10238,omitempty"`
-	Field10239      []string                     `protobuf:"bytes,16,rep,name=field10239" json:"field10239,omitempty"`
-	Field10240      *Message9182                 `protobuf:"bytes,17,opt,name=field10240" json:"field10240,omitempty"`
-	Field10241      *int32                       `protobuf:"varint,63,opt,name=field10241" json:"field10241,omitempty"`
-	Field10242      *float32                     `protobuf:"fixed32,64,opt,name=field10242" json:"field10242,omitempty"`
-	Field10243      *float32                     `protobuf:"fixed32,37,opt,name=field10243" json:"field10243,omitempty"`
-	Field10244      []float32                    `protobuf:"fixed32,43,rep,name=field10244" json:"field10244,omitempty"`
-	Field10245      *int32                       `protobuf:"varint,44,opt,name=field10245" json:"field10245,omitempty"`
-	Field10246      *Message9242                 `protobuf:"bytes,45,opt,name=field10246" json:"field10246,omitempty"`
-	Field10247      *UnusedEmptyMessage          `protobuf:"bytes,46,opt,name=field10247" json:"field10247,omitempty"`
-	Field10248      *UnusedEmptyMessage          `protobuf:"bytes,62,opt,name=field10248" json:"field10248,omitempty"`
-	Field10249      *Message8944                 `protobuf:"bytes,48,opt,name=field10249" json:"field10249,omitempty"`
-	Field10250      *UnusedEmptyMessage          `protobuf:"bytes,87,opt,name=field10250" json:"field10250,omitempty"`
-	Field10251      *int32                       `protobuf:"varint,58,opt,name=field10251" json:"field10251,omitempty"`
-	Field10252      *int32                       `protobuf:"varint,92,opt,name=field10252" json:"field10252,omitempty"`
-	Field10253      *Message9123                 `protobuf:"bytes,93,opt,name=field10253" json:"field10253,omitempty"`
-	Field10254      *Message9160                 `protobuf:"bytes,60,opt,name=field10254" json:"field10254,omitempty"`
-	Field10255      *Message8890                 `protobuf:"bytes,67,opt,name=field10255" json:"field10255,omitempty"`
-	Field10256      *string                      `protobuf:"bytes,69,opt,name=field10256" json:"field10256,omitempty"`
-	Field10257      *int64                       `protobuf:"varint,74,opt,name=field10257" json:"field10257,omitempty"`
-	Field10258      *float32                     `protobuf:"fixed32,82,opt,name=field10258" json:"field10258,omitempty"`
-	Field10259      *float32                     `protobuf:"fixed32,85,opt,name=field10259" json:"field10259,omitempty"`
-	Field10260      *float32                     `protobuf:"fixed32,86,opt,name=field10260" json:"field10260,omitempty"`
-	Field10261      *int64                       `protobuf:"varint,83,opt,name=field10261" json:"field10261,omitempty"`
-	Field10262      *string                      `protobuf:"bytes,77,opt,name=field10262" json:"field10262,omitempty"`
-	Field10263      *bool                        `protobuf:"varint,88,opt,name=field10263" json:"field10263,omitempty"`
-	Field10264      []*Message9628               `protobuf:"bytes,94,rep,name=field10264" json:"field10264,omitempty"`
+
+	Field10195   *int32                       `protobuf:"varint,1,req,name=field10195" json:"field10195,omitempty"`
+	Field10196   *int32                       `protobuf:"varint,2,req,name=field10196" json:"field10196,omitempty"`
+	Field10197   *Enum10157                   `protobuf:"varint,59,opt,name=field10197,enum=benchmarks.google_message3.Enum10157" json:"field10197,omitempty"`
+	Field10198   *int32                       `protobuf:"varint,18,opt,name=field10198" json:"field10198,omitempty"`
+	Field10199   *int32                       `protobuf:"varint,19,opt,name=field10199" json:"field10199,omitempty"`
+	Field10200   *int32                       `protobuf:"varint,21,opt,name=field10200" json:"field10200,omitempty"`
+	Message10156 []*Message10155_Message10156 `protobuf:"group,50,rep,name=Message10156,json=message10156" json:"message10156,omitempty"`
+	Field10202   *int32                       `protobuf:"varint,3,opt,name=field10202" json:"field10202,omitempty"`
+	Field10203   *int32                       `protobuf:"varint,4,opt,name=field10203" json:"field10203,omitempty"`
+	Field10204   *int32                       `protobuf:"varint,5,opt,name=field10204" json:"field10204,omitempty"`
+	Field10205   *bool                        `protobuf:"varint,84,opt,name=field10205" json:"field10205,omitempty"`
+	Field10206   *bool                        `protobuf:"varint,33,opt,name=field10206" json:"field10206,omitempty"`
+	Field10207   *int32                       `protobuf:"varint,75,opt,name=field10207" json:"field10207,omitempty"`
+	Field10208   *float32                     `protobuf:"fixed32,26,opt,name=field10208" json:"field10208,omitempty"`
+	Field10209   *int32                       `protobuf:"varint,27,opt,name=field10209" json:"field10209,omitempty"`
+	Field10210   *int32                       `protobuf:"varint,49,opt,name=field10210" json:"field10210,omitempty"`
+	Field10211   *int32                       `protobuf:"varint,10,opt,name=field10211" json:"field10211,omitempty"`
+	Field10212   *float32                     `protobuf:"fixed32,78,opt,name=field10212" json:"field10212,omitempty"`
+	Field10213   *Message9151                 `protobuf:"bytes,91,opt,name=field10213" json:"field10213,omitempty"`
+	Field10214   *int32                       `protobuf:"varint,11,opt,name=field10214" json:"field10214,omitempty"`
+	Field10215   *int32                       `protobuf:"varint,12,opt,name=field10215" json:"field10215,omitempty"`
+	Field10216   *float32                     `protobuf:"fixed32,41,opt,name=field10216" json:"field10216,omitempty"`
+	Field10217   *Message10154                `protobuf:"bytes,61,opt,name=field10217" json:"field10217,omitempty"`
+	Field10218   *int32                       `protobuf:"varint,23,opt,name=field10218" json:"field10218,omitempty"`
+	Field10219   []byte                       `protobuf:"bytes,24,opt,name=field10219" json:"field10219,omitempty"`
+	Field10220   *int32                       `protobuf:"varint,65,opt,name=field10220" json:"field10220,omitempty"`
+	Field10221   [][]byte                     `protobuf:"bytes,66,rep,name=field10221" json:"field10221,omitempty"`
+	Field10222   *int32                       `protobuf:"varint,70,opt,name=field10222" json:"field10222,omitempty"`
+	Field10223   []byte                       `protobuf:"bytes,71,opt,name=field10223" json:"field10223,omitempty"`
+	Field10224   []uint64                     `protobuf:"fixed64,73,rep,name=field10224" json:"field10224,omitempty"`
+	Field10225   *float32                     `protobuf:"fixed32,29,opt,name=field10225" json:"field10225,omitempty"`
+	Field10226   *int32                       `protobuf:"varint,30,opt,name=field10226" json:"field10226,omitempty"`
+	Field10227   *float32                     `protobuf:"fixed32,31,opt,name=field10227" json:"field10227,omitempty"`
+	Field10228   *int32                       `protobuf:"varint,32,opt,name=field10228" json:"field10228,omitempty"`
+	Field10229   *float32                     `protobuf:"fixed32,34,opt,name=field10229" json:"field10229,omitempty"`
+	Field10230   *int32                       `protobuf:"varint,35,opt,name=field10230" json:"field10230,omitempty"`
+	Field10231   *string                      `protobuf:"bytes,22,opt,name=field10231" json:"field10231,omitempty"`
+	Field10232   *uint64                      `protobuf:"fixed64,13,opt,name=field10232" json:"field10232,omitempty"`
+	Field10233   *uint64                      `protobuf:"fixed64,20,opt,name=field10233" json:"field10233,omitempty"`
+	Field10234   *bool                        `protobuf:"varint,79,opt,name=field10234" json:"field10234,omitempty"`
+	Field10235   []Enum10167                  `protobuf:"varint,80,rep,packed,name=field10235,enum=benchmarks.google_message3.Enum10167" json:"field10235,omitempty"`
+	Field10236   *int32                       `protobuf:"varint,14,opt,name=field10236" json:"field10236,omitempty"`
+	Field10237   *int32                       `protobuf:"varint,15,opt,name=field10237" json:"field10237,omitempty"`
+	Field10238   *int32                       `protobuf:"varint,28,opt,name=field10238" json:"field10238,omitempty"`
+	Field10239   []string                     `protobuf:"bytes,16,rep,name=field10239" json:"field10239,omitempty"`
+	Field10240   *Message9182                 `protobuf:"bytes,17,opt,name=field10240" json:"field10240,omitempty"`
+	Field10241   *int32                       `protobuf:"varint,63,opt,name=field10241" json:"field10241,omitempty"`
+	Field10242   *float32                     `protobuf:"fixed32,64,opt,name=field10242" json:"field10242,omitempty"`
+	Field10243   *float32                     `protobuf:"fixed32,37,opt,name=field10243" json:"field10243,omitempty"`
+	Field10244   []float32                    `protobuf:"fixed32,43,rep,name=field10244" json:"field10244,omitempty"`
+	Field10245   *int32                       `protobuf:"varint,44,opt,name=field10245" json:"field10245,omitempty"`
+	Field10246   *Message9242                 `protobuf:"bytes,45,opt,name=field10246" json:"field10246,omitempty"`
+	Field10247   *UnusedEmptyMessage          `protobuf:"bytes,46,opt,name=field10247" json:"field10247,omitempty"`
+	Field10248   *UnusedEmptyMessage          `protobuf:"bytes,62,opt,name=field10248" json:"field10248,omitempty"`
+	Field10249   *Message8944                 `protobuf:"bytes,48,opt,name=field10249" json:"field10249,omitempty"`
+	Field10250   *UnusedEmptyMessage          `protobuf:"bytes,87,opt,name=field10250" json:"field10250,omitempty"`
+	Field10251   *int32                       `protobuf:"varint,58,opt,name=field10251" json:"field10251,omitempty"`
+	Field10252   *int32                       `protobuf:"varint,92,opt,name=field10252" json:"field10252,omitempty"`
+	Field10253   *Message9123                 `protobuf:"bytes,93,opt,name=field10253" json:"field10253,omitempty"`
+	Field10254   *Message9160                 `protobuf:"bytes,60,opt,name=field10254" json:"field10254,omitempty"`
+	Field10255   *Message8890                 `protobuf:"bytes,67,opt,name=field10255" json:"field10255,omitempty"`
+	Field10256   *string                      `protobuf:"bytes,69,opt,name=field10256" json:"field10256,omitempty"`
+	Field10257   *int64                       `protobuf:"varint,74,opt,name=field10257" json:"field10257,omitempty"`
+	Field10258   *float32                     `protobuf:"fixed32,82,opt,name=field10258" json:"field10258,omitempty"`
+	Field10259   *float32                     `protobuf:"fixed32,85,opt,name=field10259" json:"field10259,omitempty"`
+	Field10260   *float32                     `protobuf:"fixed32,86,opt,name=field10260" json:"field10260,omitempty"`
+	Field10261   *int64                       `protobuf:"varint,83,opt,name=field10261" json:"field10261,omitempty"`
+	Field10262   *string                      `protobuf:"bytes,77,opt,name=field10262" json:"field10262,omitempty"`
+	Field10263   *bool                        `protobuf:"varint,88,opt,name=field10263" json:"field10263,omitempty"`
+	Field10264   []*Message9628               `protobuf:"bytes,94,rep,name=field10264" json:"field10264,omitempty"`
 }
 
 func (x *Message10155) Reset() {
@@ -1870,11 +1883,12 @@ type Message11866 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11868    *Message11014         `protobuf:"bytes,1,req,name=field11868" json:"field11868,omitempty"`
-	Field11869    *bool                 `protobuf:"varint,2,opt,name=field11869" json:"field11869,omitempty"`
-	Field11870    *float64              `protobuf:"fixed64,3,opt,name=field11870" json:"field11870,omitempty"`
-	Field11871    *float64              `protobuf:"fixed64,4,opt,name=field11871" json:"field11871,omitempty"`
-	Field11872    []*UnusedEmptyMessage `protobuf:"bytes,5,rep,name=field11872" json:"field11872,omitempty"`
+
+	Field11868 *Message11014         `protobuf:"bytes,1,req,name=field11868" json:"field11868,omitempty"`
+	Field11869 *bool                 `protobuf:"varint,2,opt,name=field11869" json:"field11869,omitempty"`
+	Field11870 *float64              `protobuf:"fixed64,3,opt,name=field11870" json:"field11870,omitempty"`
+	Field11871 *float64              `protobuf:"fixed64,4,opt,name=field11871" json:"field11871,omitempty"`
+	Field11872 []*UnusedEmptyMessage `protobuf:"bytes,5,rep,name=field11872" json:"field11872,omitempty"`
 }
 
 func (x *Message11866) Reset() {
@@ -1943,15 +1957,16 @@ type Message10469 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10473    *string  `protobuf:"bytes,1,opt,name=field10473" json:"field10473,omitempty"`
-	Field10474    *float32 `protobuf:"fixed32,2,opt,name=field10474" json:"field10474,omitempty"`
-	Field10475    *int32   `protobuf:"varint,3,opt,name=field10475" json:"field10475,omitempty"`
-	Field10476    *int32   `protobuf:"varint,4,opt,name=field10476" json:"field10476,omitempty"`
-	Field10477    *int32   `protobuf:"varint,5,opt,name=field10477" json:"field10477,omitempty"`
-	Field10478    *bool    `protobuf:"varint,6,opt,name=field10478" json:"field10478,omitempty"`
-	Field10479    *bool    `protobuf:"varint,7,opt,name=field10479" json:"field10479,omitempty"`
-	Field10480    *int32   `protobuf:"varint,8,opt,name=field10480" json:"field10480,omitempty"`
-	Field10481    *float32 `protobuf:"fixed32,9,opt,name=field10481" json:"field10481,omitempty"`
+
+	Field10473 *string  `protobuf:"bytes,1,opt,name=field10473" json:"field10473,omitempty"`
+	Field10474 *float32 `protobuf:"fixed32,2,opt,name=field10474" json:"field10474,omitempty"`
+	Field10475 *int32   `protobuf:"varint,3,opt,name=field10475" json:"field10475,omitempty"`
+	Field10476 *int32   `protobuf:"varint,4,opt,name=field10476" json:"field10476,omitempty"`
+	Field10477 *int32   `protobuf:"varint,5,opt,name=field10477" json:"field10477,omitempty"`
+	Field10478 *bool    `protobuf:"varint,6,opt,name=field10478" json:"field10478,omitempty"`
+	Field10479 *bool    `protobuf:"varint,7,opt,name=field10479" json:"field10479,omitempty"`
+	Field10480 *int32   `protobuf:"varint,8,opt,name=field10480" json:"field10480,omitempty"`
+	Field10481 *float32 `protobuf:"fixed32,9,opt,name=field10481" json:"field10481,omitempty"`
 }
 
 func (x *Message10469) Reset() {
@@ -2048,8 +2063,9 @@ type Message10818 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10819    *Message10800 `protobuf:"bytes,1,opt,name=field10819" json:"field10819,omitempty"`
-	Field10820    *Message10801 `protobuf:"bytes,2,opt,name=field10820" json:"field10820,omitempty"`
+
+	Field10819 *Message10800 `protobuf:"bytes,1,opt,name=field10819" json:"field10819,omitempty"`
+	Field10820 *Message10801 `protobuf:"bytes,2,opt,name=field10820" json:"field10820,omitempty"`
 }
 
 func (x *Message10818) Reset() {
@@ -2097,29 +2113,30 @@ type Message10773 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10774    *bool                 `protobuf:"varint,9,opt,name=field10774" json:"field10774,omitempty"`
-	Field10775    *bool                 `protobuf:"varint,1,opt,name=field10775" json:"field10775,omitempty"`
-	Field10776    *bool                 `protobuf:"varint,23,opt,name=field10776" json:"field10776,omitempty"`
-	Field10777    *bool                 `protobuf:"varint,2,opt,name=field10777" json:"field10777,omitempty"`
-	Field10778    *bool                 `protobuf:"varint,3,opt,name=field10778" json:"field10778,omitempty"`
-	Field10779    *int32                `protobuf:"varint,4,opt,name=field10779" json:"field10779,omitempty"`
-	Field10780    *int32                `protobuf:"varint,5,opt,name=field10780" json:"field10780,omitempty"`
-	Field10781    *int32                `protobuf:"varint,6,opt,name=field10781" json:"field10781,omitempty"`
-	Field10782    *int32                `protobuf:"varint,7,opt,name=field10782" json:"field10782,omitempty"`
-	Field10783    *int32                `protobuf:"varint,8,opt,name=field10783" json:"field10783,omitempty"`
-	Field10784    *int32                `protobuf:"varint,10,opt,name=field10784" json:"field10784,omitempty"`
-	Field10785    *Message10749         `protobuf:"bytes,11,opt,name=field10785" json:"field10785,omitempty"`
-	Field10786    []*UnusedEmptyMessage `protobuf:"bytes,12,rep,name=field10786" json:"field10786,omitempty"`
-	Field10787    *bool                 `protobuf:"varint,13,opt,name=field10787" json:"field10787,omitempty"`
-	Field10788    *bool                 `protobuf:"varint,15,opt,name=field10788" json:"field10788,omitempty"`
-	Field10789    *bool                 `protobuf:"varint,16,opt,name=field10789" json:"field10789,omitempty"`
-	Field10790    *int32                `protobuf:"varint,17,opt,name=field10790" json:"field10790,omitempty"`
-	Field10791    *int32                `protobuf:"varint,18,opt,name=field10791" json:"field10791,omitempty"`
-	Field10792    *bool                 `protobuf:"varint,19,opt,name=field10792" json:"field10792,omitempty"`
-	Field10793    *bool                 `protobuf:"varint,20,opt,name=field10793" json:"field10793,omitempty"`
-	Field10794    *bool                 `protobuf:"varint,21,opt,name=field10794" json:"field10794,omitempty"`
-	Field10795    *UnusedEnum           `protobuf:"varint,14,opt,name=field10795,enum=benchmarks.google_message3.UnusedEnum" json:"field10795,omitempty"`
-	Field10796    *UnusedEnum           `protobuf:"varint,22,opt,name=field10796,enum=benchmarks.google_message3.UnusedEnum" json:"field10796,omitempty"`
+
+	Field10774 *bool                 `protobuf:"varint,9,opt,name=field10774" json:"field10774,omitempty"`
+	Field10775 *bool                 `protobuf:"varint,1,opt,name=field10775" json:"field10775,omitempty"`
+	Field10776 *bool                 `protobuf:"varint,23,opt,name=field10776" json:"field10776,omitempty"`
+	Field10777 *bool                 `protobuf:"varint,2,opt,name=field10777" json:"field10777,omitempty"`
+	Field10778 *bool                 `protobuf:"varint,3,opt,name=field10778" json:"field10778,omitempty"`
+	Field10779 *int32                `protobuf:"varint,4,opt,name=field10779" json:"field10779,omitempty"`
+	Field10780 *int32                `protobuf:"varint,5,opt,name=field10780" json:"field10780,omitempty"`
+	Field10781 *int32                `protobuf:"varint,6,opt,name=field10781" json:"field10781,omitempty"`
+	Field10782 *int32                `protobuf:"varint,7,opt,name=field10782" json:"field10782,omitempty"`
+	Field10783 *int32                `protobuf:"varint,8,opt,name=field10783" json:"field10783,omitempty"`
+	Field10784 *int32                `protobuf:"varint,10,opt,name=field10784" json:"field10784,omitempty"`
+	Field10785 *Message10749         `protobuf:"bytes,11,opt,name=field10785" json:"field10785,omitempty"`
+	Field10786 []*UnusedEmptyMessage `protobuf:"bytes,12,rep,name=field10786" json:"field10786,omitempty"`
+	Field10787 *bool                 `protobuf:"varint,13,opt,name=field10787" json:"field10787,omitempty"`
+	Field10788 *bool                 `protobuf:"varint,15,opt,name=field10788" json:"field10788,omitempty"`
+	Field10789 *bool                 `protobuf:"varint,16,opt,name=field10789" json:"field10789,omitempty"`
+	Field10790 *int32                `protobuf:"varint,17,opt,name=field10790" json:"field10790,omitempty"`
+	Field10791 *int32                `protobuf:"varint,18,opt,name=field10791" json:"field10791,omitempty"`
+	Field10792 *bool                 `protobuf:"varint,19,opt,name=field10792" json:"field10792,omitempty"`
+	Field10793 *bool                 `protobuf:"varint,20,opt,name=field10793" json:"field10793,omitempty"`
+	Field10794 *bool                 `protobuf:"varint,21,opt,name=field10794" json:"field10794,omitempty"`
+	Field10795 *UnusedEnum           `protobuf:"varint,14,opt,name=field10795,enum=benchmarks.google_message3.UnusedEnum" json:"field10795,omitempty"`
+	Field10796 *UnusedEnum           `protobuf:"varint,22,opt,name=field10796,enum=benchmarks.google_message3.UnusedEnum" json:"field10796,omitempty"`
 }
 
 func (x *Message10773) Reset() {
@@ -2315,9 +2332,10 @@ type Message13145 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field13155      *Enum13146 `protobuf:"varint,1,req,name=field13155,enum=benchmarks.google_message3.Enum13146" json:"field13155,omitempty"`
-	Field13156      *float32   `protobuf:"fixed32,2,opt,name=field13156" json:"field13156,omitempty"`
-	Field13157      *float32   `protobuf:"fixed32,3,opt,name=field13157" json:"field13157,omitempty"`
+
+	Field13155 *Enum13146 `protobuf:"varint,1,req,name=field13155,enum=benchmarks.google_message3.Enum13146" json:"field13155,omitempty"`
+	Field13156 *float32   `protobuf:"fixed32,2,opt,name=field13156" json:"field13156,omitempty"`
+	Field13157 *float32   `protobuf:"fixed32,3,opt,name=field13157" json:"field13157,omitempty"`
 }
 
 func (x *Message13145) Reset() {
@@ -2414,8 +2432,9 @@ type Message12796 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12800    []uint64 `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
-	Field12801    *uint64  `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
+
+	Field12800 []uint64 `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
+	Field12801 *uint64  `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
 }
 
 func (x *Message12796) Reset() {
@@ -2595,8 +2614,9 @@ type Message8183 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8226     *string `protobuf:"bytes,1,opt,name=field8226" json:"field8226,omitempty"`
-	Field8227     *string `protobuf:"bytes,2,opt,name=field8227" json:"field8227,omitempty"`
+
+	Field8226 *string `protobuf:"bytes,1,opt,name=field8226" json:"field8226,omitempty"`
+	Field8227 *string `protobuf:"bytes,2,opt,name=field8227" json:"field8227,omitempty"`
 }
 
 func (x *Message8183) Reset() {
@@ -2645,17 +2665,18 @@ type Message8301 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field8328       *string             `protobuf:"bytes,1,opt,name=field8328" json:"field8328,omitempty"`
-	Field8329       *Message7966        `protobuf:"bytes,2,opt,name=field8329" json:"field8329,omitempty"`
-	Field8330       *string             `protobuf:"bytes,3,opt,name=field8330" json:"field8330,omitempty"`
-	Field8331       *string             `protobuf:"bytes,4,opt,name=field8331" json:"field8331,omitempty"`
-	Field8332       []*Message8290      `protobuf:"bytes,5,rep,name=field8332" json:"field8332,omitempty"`
-	Field8333       *Message7966        `protobuf:"bytes,6,opt,name=field8333" json:"field8333,omitempty"`
-	Field8334       []*Message8298      `protobuf:"bytes,7,rep,name=field8334" json:"field8334,omitempty"`
-	Field8335       *Message8300        `protobuf:"bytes,8,opt,name=field8335" json:"field8335,omitempty"`
-	Field8336       *int64              `protobuf:"varint,9,opt,name=field8336" json:"field8336,omitempty"`
-	Field8337       *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field8337" json:"field8337,omitempty"`
-	Field8338       *Message7965        `protobuf:"bytes,11,opt,name=field8338" json:"field8338,omitempty"`
+
+	Field8328 *string             `protobuf:"bytes,1,opt,name=field8328" json:"field8328,omitempty"`
+	Field8329 *Message7966        `protobuf:"bytes,2,opt,name=field8329" json:"field8329,omitempty"`
+	Field8330 *string             `protobuf:"bytes,3,opt,name=field8330" json:"field8330,omitempty"`
+	Field8331 *string             `protobuf:"bytes,4,opt,name=field8331" json:"field8331,omitempty"`
+	Field8332 []*Message8290      `protobuf:"bytes,5,rep,name=field8332" json:"field8332,omitempty"`
+	Field8333 *Message7966        `protobuf:"bytes,6,opt,name=field8333" json:"field8333,omitempty"`
+	Field8334 []*Message8298      `protobuf:"bytes,7,rep,name=field8334" json:"field8334,omitempty"`
+	Field8335 *Message8300        `protobuf:"bytes,8,opt,name=field8335" json:"field8335,omitempty"`
+	Field8336 *int64              `protobuf:"varint,9,opt,name=field8336" json:"field8336,omitempty"`
+	Field8337 *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field8337" json:"field8337,omitempty"`
+	Field8338 *Message7965        `protobuf:"bytes,11,opt,name=field8338" json:"field8338,omitempty"`
 }
 
 func (x *Message8301) Reset() {
@@ -2809,27 +2830,28 @@ type Message8302 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field8339       *string               `protobuf:"bytes,1,opt,name=field8339" json:"field8339,omitempty"`
-	Field8340       *Message7966          `protobuf:"bytes,2,opt,name=field8340" json:"field8340,omitempty"`
-	Field8341       *string               `protobuf:"bytes,3,opt,name=field8341" json:"field8341,omitempty"`
-	Field8342       *string               `protobuf:"bytes,4,opt,name=field8342" json:"field8342,omitempty"`
-	Field8343       *string               `protobuf:"bytes,5,opt,name=field8343" json:"field8343,omitempty"`
-	Field8344       *string               `protobuf:"bytes,6,opt,name=field8344" json:"field8344,omitempty"`
-	Field8345       *string               `protobuf:"bytes,7,opt,name=field8345" json:"field8345,omitempty"`
-	Field8346       *int64                `protobuf:"varint,8,opt,name=field8346" json:"field8346,omitempty"`
-	Field8347       *int64                `protobuf:"varint,9,opt,name=field8347" json:"field8347,omitempty"`
-	Field8348       []*Message8290        `protobuf:"bytes,10,rep,name=field8348" json:"field8348,omitempty"`
-	Field8349       *string               `protobuf:"bytes,11,opt,name=field8349" json:"field8349,omitempty"`
-	Field8350       *UnusedEmptyMessage   `protobuf:"bytes,12,opt,name=field8350" json:"field8350,omitempty"`
-	Field8351       *Message8291          `protobuf:"bytes,13,opt,name=field8351" json:"field8351,omitempty"`
-	Field8352       *int64                `protobuf:"varint,14,opt,name=field8352" json:"field8352,omitempty"`
-	Field8353       *Message8296          `protobuf:"bytes,15,opt,name=field8353" json:"field8353,omitempty"`
-	Field8354       *string               `protobuf:"bytes,16,opt,name=field8354" json:"field8354,omitempty"`
-	Field8355       *UnusedEmptyMessage   `protobuf:"bytes,17,opt,name=field8355" json:"field8355,omitempty"`
-	Field8356       []int32               `protobuf:"varint,18,rep,name=field8356" json:"field8356,omitempty"`
-	Field8357       []int32               `protobuf:"varint,19,rep,name=field8357" json:"field8357,omitempty"`
-	Field8358       []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field8358" json:"field8358,omitempty"`
-	Field8359       *Message7965          `protobuf:"bytes,21,opt,name=field8359" json:"field8359,omitempty"`
+
+	Field8339 *string               `protobuf:"bytes,1,opt,name=field8339" json:"field8339,omitempty"`
+	Field8340 *Message7966          `protobuf:"bytes,2,opt,name=field8340" json:"field8340,omitempty"`
+	Field8341 *string               `protobuf:"bytes,3,opt,name=field8341" json:"field8341,omitempty"`
+	Field8342 *string               `protobuf:"bytes,4,opt,name=field8342" json:"field8342,omitempty"`
+	Field8343 *string               `protobuf:"bytes,5,opt,name=field8343" json:"field8343,omitempty"`
+	Field8344 *string               `protobuf:"bytes,6,opt,name=field8344" json:"field8344,omitempty"`
+	Field8345 *string               `protobuf:"bytes,7,opt,name=field8345" json:"field8345,omitempty"`
+	Field8346 *int64                `protobuf:"varint,8,opt,name=field8346" json:"field8346,omitempty"`
+	Field8347 *int64                `protobuf:"varint,9,opt,name=field8347" json:"field8347,omitempty"`
+	Field8348 []*Message8290        `protobuf:"bytes,10,rep,name=field8348" json:"field8348,omitempty"`
+	Field8349 *string               `protobuf:"bytes,11,opt,name=field8349" json:"field8349,omitempty"`
+	Field8350 *UnusedEmptyMessage   `protobuf:"bytes,12,opt,name=field8350" json:"field8350,omitempty"`
+	Field8351 *Message8291          `protobuf:"bytes,13,opt,name=field8351" json:"field8351,omitempty"`
+	Field8352 *int64                `protobuf:"varint,14,opt,name=field8352" json:"field8352,omitempty"`
+	Field8353 *Message8296          `protobuf:"bytes,15,opt,name=field8353" json:"field8353,omitempty"`
+	Field8354 *string               `protobuf:"bytes,16,opt,name=field8354" json:"field8354,omitempty"`
+	Field8355 *UnusedEmptyMessage   `protobuf:"bytes,17,opt,name=field8355" json:"field8355,omitempty"`
+	Field8356 []int32               `protobuf:"varint,18,rep,name=field8356" json:"field8356,omitempty"`
+	Field8357 []int32               `protobuf:"varint,19,rep,name=field8357" json:"field8357,omitempty"`
+	Field8358 []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field8358" json:"field8358,omitempty"`
+	Field8359 *Message7965          `protobuf:"bytes,21,opt,name=field8359" json:"field8359,omitempty"`
 }
 
 func (x *Message8302) Reset() {
@@ -3052,13 +3074,14 @@ type Message8449 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8458     *string      `protobuf:"bytes,1,opt,name=field8458" json:"field8458,omitempty"`
-	Field8459     *bool        `protobuf:"varint,2,opt,name=field8459" json:"field8459,omitempty"`
-	Field8460     *Enum8450    `protobuf:"varint,3,opt,name=field8460,enum=benchmarks.google_message3.Enum8450" json:"field8460,omitempty"`
-	Field8461     []string     `protobuf:"bytes,4,rep,name=field8461" json:"field8461,omitempty"`
-	Field8462     *string      `protobuf:"bytes,5,opt,name=field8462" json:"field8462,omitempty"`
-	Field8463     *string      `protobuf:"bytes,6,opt,name=field8463" json:"field8463,omitempty"`
-	Field8464     *Message7966 `protobuf:"bytes,7,opt,name=field8464" json:"field8464,omitempty"`
+
+	Field8458 *string      `protobuf:"bytes,1,opt,name=field8458" json:"field8458,omitempty"`
+	Field8459 *bool        `protobuf:"varint,2,opt,name=field8459" json:"field8459,omitempty"`
+	Field8460 *Enum8450    `protobuf:"varint,3,opt,name=field8460,enum=benchmarks.google_message3.Enum8450" json:"field8460,omitempty"`
+	Field8461 []string     `protobuf:"bytes,4,rep,name=field8461" json:"field8461,omitempty"`
+	Field8462 *string      `protobuf:"bytes,5,opt,name=field8462" json:"field8462,omitempty"`
+	Field8463 *string      `protobuf:"bytes,6,opt,name=field8463" json:"field8463,omitempty"`
+	Field8464 *Message7966 `protobuf:"bytes,7,opt,name=field8464" json:"field8464,omitempty"`
 }
 
 func (x *Message8449) Reset() {
@@ -3141,9 +3164,10 @@ type Message13358 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13359    *uint64             `protobuf:"fixed64,1,req,name=field13359" json:"field13359,omitempty"`
-	Field13360    *uint64             `protobuf:"fixed64,2,req,name=field13360" json:"field13360,omitempty"`
-	Field13361    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field13361" json:"field13361,omitempty"`
+
+	Field13359 *uint64             `protobuf:"fixed64,1,req,name=field13359" json:"field13359,omitempty"`
+	Field13360 *uint64             `protobuf:"fixed64,2,req,name=field13360" json:"field13360,omitempty"`
+	Field13361 *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field13361" json:"field13361,omitempty"`
 }
 
 func (x *Message13358) Reset() {
@@ -3198,10 +3222,11 @@ type Message13912 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13913    *uint32             `protobuf:"fixed32,1,req,name=field13913" json:"field13913,omitempty"`
-	Field13914    *uint32             `protobuf:"fixed32,2,req,name=field13914" json:"field13914,omitempty"`
-	Field13915    *UnusedEmptyMessage `protobuf:"bytes,500,opt,name=field13915" json:"field13915,omitempty"`
-	Field13916    *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field13916" json:"field13916,omitempty"`
+
+	Field13913 *uint32             `protobuf:"fixed32,1,req,name=field13913" json:"field13913,omitempty"`
+	Field13914 *uint32             `protobuf:"fixed32,2,req,name=field13914" json:"field13914,omitempty"`
+	Field13915 *UnusedEmptyMessage `protobuf:"bytes,500,opt,name=field13915" json:"field13915,omitempty"`
+	Field13916 *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field13916" json:"field13916,omitempty"`
 }
 
 func (x *Message13912) Reset() {
@@ -3263,9 +3288,10 @@ type Message24316 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24443    []string `protobuf:"bytes,1,rep,name=field24443" json:"field24443,omitempty"`
-	Field24444    []string `protobuf:"bytes,2,rep,name=field24444" json:"field24444,omitempty"`
-	Field24445    []string `protobuf:"bytes,3,rep,name=field24445" json:"field24445,omitempty"`
+
+	Field24443 []string `protobuf:"bytes,1,rep,name=field24443" json:"field24443,omitempty"`
+	Field24444 []string `protobuf:"bytes,2,rep,name=field24444" json:"field24444,omitempty"`
+	Field24445 []string `protobuf:"bytes,3,rep,name=field24445" json:"field24445,omitempty"`
 }
 
 func (x *Message24316) Reset() {
@@ -3320,12 +3346,13 @@ type Message24312 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24421    *string  `protobuf:"bytes,1,opt,name=field24421" json:"field24421,omitempty"`
-	Field24422    *string  `protobuf:"bytes,2,opt,name=field24422" json:"field24422,omitempty"`
-	Field24423    []string `protobuf:"bytes,3,rep,name=field24423" json:"field24423,omitempty"`
-	Field24424    []string `protobuf:"bytes,4,rep,name=field24424" json:"field24424,omitempty"`
-	Field24425    []string `protobuf:"bytes,5,rep,name=field24425" json:"field24425,omitempty"`
-	Field24426    []string `protobuf:"bytes,6,rep,name=field24426" json:"field24426,omitempty"`
+
+	Field24421 *string  `protobuf:"bytes,1,opt,name=field24421" json:"field24421,omitempty"`
+	Field24422 *string  `protobuf:"bytes,2,opt,name=field24422" json:"field24422,omitempty"`
+	Field24423 []string `protobuf:"bytes,3,rep,name=field24423" json:"field24423,omitempty"`
+	Field24424 []string `protobuf:"bytes,4,rep,name=field24424" json:"field24424,omitempty"`
+	Field24425 []string `protobuf:"bytes,5,rep,name=field24425" json:"field24425,omitempty"`
+	Field24426 []string `protobuf:"bytes,6,rep,name=field24426" json:"field24426,omitempty"`
 }
 
 func (x *Message24312) Reset() {
@@ -3401,16 +3428,17 @@ type Message24313 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24427    *string  `protobuf:"bytes,1,opt,name=field24427" json:"field24427,omitempty"`
-	Field24428    *string  `protobuf:"bytes,2,opt,name=field24428" json:"field24428,omitempty"`
-	Field24429    []string `protobuf:"bytes,3,rep,name=field24429" json:"field24429,omitempty"`
-	Field24430    *string  `protobuf:"bytes,4,opt,name=field24430" json:"field24430,omitempty"`
-	Field24431    *string  `protobuf:"bytes,5,opt,name=field24431" json:"field24431,omitempty"`
-	Field24432    *string  `protobuf:"bytes,6,opt,name=field24432" json:"field24432,omitempty"`
-	Field24433    *string  `protobuf:"bytes,7,opt,name=field24433" json:"field24433,omitempty"`
-	Field24434    []string `protobuf:"bytes,8,rep,name=field24434" json:"field24434,omitempty"`
-	Field24435    *string  `protobuf:"bytes,9,opt,name=field24435" json:"field24435,omitempty"`
-	Field24436    []string `protobuf:"bytes,10,rep,name=field24436" json:"field24436,omitempty"`
+
+	Field24427 *string  `protobuf:"bytes,1,opt,name=field24427" json:"field24427,omitempty"`
+	Field24428 *string  `protobuf:"bytes,2,opt,name=field24428" json:"field24428,omitempty"`
+	Field24429 []string `protobuf:"bytes,3,rep,name=field24429" json:"field24429,omitempty"`
+	Field24430 *string  `protobuf:"bytes,4,opt,name=field24430" json:"field24430,omitempty"`
+	Field24431 *string  `protobuf:"bytes,5,opt,name=field24431" json:"field24431,omitempty"`
+	Field24432 *string  `protobuf:"bytes,6,opt,name=field24432" json:"field24432,omitempty"`
+	Field24433 *string  `protobuf:"bytes,7,opt,name=field24433" json:"field24433,omitempty"`
+	Field24434 []string `protobuf:"bytes,8,rep,name=field24434" json:"field24434,omitempty"`
+	Field24435 *string  `protobuf:"bytes,9,opt,name=field24435" json:"field24435,omitempty"`
+	Field24436 []string `protobuf:"bytes,10,rep,name=field24436" json:"field24436,omitempty"`
 }
 
 func (x *Message24313) Reset() {
@@ -3514,9 +3542,10 @@ type Message24315 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field24440    *string  `protobuf:"bytes,1,req,name=field24440" json:"field24440,omitempty"`
-	Field24441    []string `protobuf:"bytes,2,rep,name=field24441" json:"field24441,omitempty"`
-	Field24442    []string `protobuf:"bytes,3,rep,name=field24442" json:"field24442,omitempty"`
+
+	Field24440 *string  `protobuf:"bytes,1,req,name=field24440" json:"field24440,omitempty"`
+	Field24441 []string `protobuf:"bytes,2,rep,name=field24441" json:"field24441,omitempty"`
+	Field24442 []string `protobuf:"bytes,3,rep,name=field24442" json:"field24442,omitempty"`
 }
 
 func (x *Message24315) Reset() {
@@ -3571,10 +3600,11 @@ type Message716 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field872      *string     `protobuf:"bytes,1,req,name=field872" json:"field872,omitempty"`
-	Field873      *int32      `protobuf:"varint,2,req,name=field873" json:"field873,omitempty"`
-	Field874      *bool       `protobuf:"varint,3,opt,name=field874" json:"field874,omitempty"`
-	Field875      *Message717 `protobuf:"bytes,4,opt,name=field875" json:"field875,omitempty"`
+
+	Field872 *string     `protobuf:"bytes,1,req,name=field872" json:"field872,omitempty"`
+	Field873 *int32      `protobuf:"varint,2,req,name=field873" json:"field873,omitempty"`
+	Field874 *bool       `protobuf:"varint,3,opt,name=field874" json:"field874,omitempty"`
+	Field875 *Message717 `protobuf:"bytes,4,opt,name=field875" json:"field875,omitempty"`
 }
 
 func (x *Message716) Reset() {
@@ -3636,9 +3666,10 @@ type Message718 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field878      []string `protobuf:"bytes,1,rep,name=field878" json:"field878,omitempty"`
-	Field879      []string `protobuf:"bytes,2,rep,name=field879" json:"field879,omitempty"`
-	Field880      *string  `protobuf:"bytes,3,opt,name=field880" json:"field880,omitempty"`
+
+	Field878 []string `protobuf:"bytes,1,rep,name=field878" json:"field878,omitempty"`
+	Field879 []string `protobuf:"bytes,2,rep,name=field879" json:"field879,omitempty"`
+	Field880 *string  `protobuf:"bytes,3,opt,name=field880" json:"field880,omitempty"`
 }
 
 func (x *Message718) Reset() {
@@ -3693,11 +3724,12 @@ type Message703 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field795      *string  `protobuf:"bytes,1,req,name=field795" json:"field795,omitempty"`
-	Field796      []string `protobuf:"bytes,2,rep,name=field796" json:"field796,omitempty"`
-	Field797      []string `protobuf:"bytes,3,rep,name=field797" json:"field797,omitempty"`
-	Field798      *string  `protobuf:"bytes,4,opt,name=field798" json:"field798,omitempty"`
-	Field799      []string `protobuf:"bytes,5,rep,name=field799" json:"field799,omitempty"`
+
+	Field795 *string  `protobuf:"bytes,1,req,name=field795" json:"field795,omitempty"`
+	Field796 []string `protobuf:"bytes,2,rep,name=field796" json:"field796,omitempty"`
+	Field797 []string `protobuf:"bytes,3,rep,name=field797" json:"field797,omitempty"`
+	Field798 *string  `protobuf:"bytes,4,opt,name=field798" json:"field798,omitempty"`
+	Field799 []string `protobuf:"bytes,5,rep,name=field799" json:"field799,omitempty"`
 }
 
 func (x *Message703) Reset() {
@@ -3766,19 +3798,20 @@ type Message715 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field859      *string       `protobuf:"bytes,1,req,name=field859" json:"field859,omitempty"`
-	Field860      *string       `protobuf:"bytes,7,opt,name=field860" json:"field860,omitempty"`
-	Field861      []*Message707 `protobuf:"bytes,2,rep,name=field861" json:"field861,omitempty"`
-	Field862      []*Message708 `protobuf:"bytes,3,rep,name=field862" json:"field862,omitempty"`
-	Field863      []*Message711 `protobuf:"bytes,4,rep,name=field863" json:"field863,omitempty"`
-	Field864      []*Message712 `protobuf:"bytes,5,rep,name=field864" json:"field864,omitempty"`
-	Field865      []*Message713 `protobuf:"bytes,6,rep,name=field865" json:"field865,omitempty"`
-	Field866      []*Message714 `protobuf:"bytes,8,rep,name=field866" json:"field866,omitempty"`
-	Field867      []*Message710 `protobuf:"bytes,9,rep,name=field867" json:"field867,omitempty"`
-	Field868      []*Message709 `protobuf:"bytes,10,rep,name=field868" json:"field868,omitempty"`
-	Field869      []*Message705 `protobuf:"bytes,11,rep,name=field869" json:"field869,omitempty"`
-	Field870      []*Message702 `protobuf:"bytes,12,rep,name=field870" json:"field870,omitempty"`
-	Field871      []*Message706 `protobuf:"bytes,13,rep,name=field871" json:"field871,omitempty"`
+
+	Field859 *string       `protobuf:"bytes,1,req,name=field859" json:"field859,omitempty"`
+	Field860 *string       `protobuf:"bytes,7,opt,name=field860" json:"field860,omitempty"`
+	Field861 []*Message707 `protobuf:"bytes,2,rep,name=field861" json:"field861,omitempty"`
+	Field862 []*Message708 `protobuf:"bytes,3,rep,name=field862" json:"field862,omitempty"`
+	Field863 []*Message711 `protobuf:"bytes,4,rep,name=field863" json:"field863,omitempty"`
+	Field864 []*Message712 `protobuf:"bytes,5,rep,name=field864" json:"field864,omitempty"`
+	Field865 []*Message713 `protobuf:"bytes,6,rep,name=field865" json:"field865,omitempty"`
+	Field866 []*Message714 `protobuf:"bytes,8,rep,name=field866" json:"field866,omitempty"`
+	Field867 []*Message710 `protobuf:"bytes,9,rep,name=field867" json:"field867,omitempty"`
+	Field868 []*Message709 `protobuf:"bytes,10,rep,name=field868" json:"field868,omitempty"`
+	Field869 []*Message705 `protobuf:"bytes,11,rep,name=field869" json:"field869,omitempty"`
+	Field870 []*Message702 `protobuf:"bytes,12,rep,name=field870" json:"field870,omitempty"`
+	Field871 []*Message706 `protobuf:"bytes,13,rep,name=field871" json:"field871,omitempty"`
 }
 
 func (x *Message715) Reset() {
@@ -3903,8 +3936,9 @@ type Message700 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field789      []string `protobuf:"bytes,1,rep,name=field789" json:"field789,omitempty"`
-	Field790      []string `protobuf:"bytes,2,rep,name=field790" json:"field790,omitempty"`
+
+	Field789 []string `protobuf:"bytes,1,rep,name=field789" json:"field789,omitempty"`
+	Field790 []string `protobuf:"bytes,2,rep,name=field790" json:"field790,omitempty"`
 }
 
 func (x *Message700) Reset() {
@@ -3952,8 +3986,9 @@ type Message699 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field787      *string  `protobuf:"bytes,1,req,name=field787" json:"field787,omitempty"`
-	Field788      []string `protobuf:"bytes,2,rep,name=field788" json:"field788,omitempty"`
+
+	Field787 *string  `protobuf:"bytes,1,req,name=field787" json:"field787,omitempty"`
+	Field788 []string `protobuf:"bytes,2,rep,name=field788" json:"field788,omitempty"`
 }
 
 func (x *Message699) Reset() {
@@ -4001,14 +4036,15 @@ type Message698 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field779      *string  `protobuf:"bytes,1,opt,name=field779" json:"field779,omitempty"`
-	Field780      *string  `protobuf:"bytes,2,opt,name=field780" json:"field780,omitempty"`
-	Field781      *string  `protobuf:"bytes,3,opt,name=field781" json:"field781,omitempty"`
-	Field782      *string  `protobuf:"bytes,4,opt,name=field782" json:"field782,omitempty"`
-	Field783      *uint64  `protobuf:"varint,5,opt,name=field783" json:"field783,omitempty"`
-	Field784      *uint32  `protobuf:"varint,6,opt,name=field784" json:"field784,omitempty"`
-	Field785      *int64   `protobuf:"varint,7,opt,name=field785" json:"field785,omitempty"`
-	Field786      []string `protobuf:"bytes,8,rep,name=field786" json:"field786,omitempty"`
+
+	Field779 *string  `protobuf:"bytes,1,opt,name=field779" json:"field779,omitempty"`
+	Field780 *string  `protobuf:"bytes,2,opt,name=field780" json:"field780,omitempty"`
+	Field781 *string  `protobuf:"bytes,3,opt,name=field781" json:"field781,omitempty"`
+	Field782 *string  `protobuf:"bytes,4,opt,name=field782" json:"field782,omitempty"`
+	Field783 *uint64  `protobuf:"varint,5,opt,name=field783" json:"field783,omitempty"`
+	Field784 *uint32  `protobuf:"varint,6,opt,name=field784" json:"field784,omitempty"`
+	Field785 *int64   `protobuf:"varint,7,opt,name=field785" json:"field785,omitempty"`
+	Field786 []string `protobuf:"bytes,8,rep,name=field786" json:"field786,omitempty"`
 }
 
 func (x *Message698) Reset() {
@@ -4098,10 +4134,11 @@ type Message10155_Message10156 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10266    *Enum8862 `protobuf:"varint,51,opt,name=field10266,enum=benchmarks.google_message3.Enum8862" json:"field10266,omitempty"`
-	Field10267    *int32    `protobuf:"varint,52,opt,name=field10267" json:"field10267,omitempty"`
-	Field10268    *int32    `protobuf:"varint,53,opt,name=field10268" json:"field10268,omitempty"`
-	Field10269    *int32    `protobuf:"varint,54,opt,name=field10269" json:"field10269,omitempty"`
+
+	Field10266 *Enum8862 `protobuf:"varint,51,opt,name=field10266,enum=benchmarks.google_message3.Enum8862" json:"field10266,omitempty"`
+	Field10267 *int32    `protobuf:"varint,52,opt,name=field10267" json:"field10267,omitempty"`
+	Field10268 *int32    `protobuf:"varint,53,opt,name=field10268" json:"field10268,omitempty"`
+	Field10269 *int32    `protobuf:"varint,54,opt,name=field10269" json:"field10269,omitempty"`
 }
 
 func (x *Message10155_Message10156) Reset() {

internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go

@@ -55,8 +55,9 @@ type Message10154 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10192    []byte `protobuf:"bytes,1,opt,name=field10192" json:"field10192,omitempty"`
-	Field10193    *int32 `protobuf:"varint,2,opt,name=field10193" json:"field10193,omitempty"`
+
+	Field10192 []byte `protobuf:"bytes,1,opt,name=field10192" json:"field10192,omitempty"`
+	Field10193 *int32 `protobuf:"varint,2,opt,name=field10193" json:"field10193,omitempty"`
 }
 
 func (x *Message10154) Reset() {
@@ -104,68 +105,69 @@ type Message8944 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9045     *string      `protobuf:"bytes,2,opt,name=field9045" json:"field9045,omitempty"`
-	Field9046     *string      `protobuf:"bytes,3,opt,name=field9046" json:"field9046,omitempty"`
-	Field9047     *string      `protobuf:"bytes,23,opt,name=field9047" json:"field9047,omitempty"`
-	Field9048     *string      `protobuf:"bytes,52,opt,name=field9048" json:"field9048,omitempty"`
-	Field9049     *int32       `protobuf:"varint,53,opt,name=field9049" json:"field9049,omitempty"`
-	Field9050     *int32       `protobuf:"varint,54,opt,name=field9050" json:"field9050,omitempty"`
-	Field9051     *float32     `protobuf:"fixed32,55,opt,name=field9051" json:"field9051,omitempty"`
-	Field9052     *float32     `protobuf:"fixed32,56,opt,name=field9052" json:"field9052,omitempty"`
-	Field9053     *string      `protobuf:"bytes,57,opt,name=field9053" json:"field9053,omitempty"`
-	Field9054     *int64       `protobuf:"varint,1,opt,name=field9054" json:"field9054,omitempty"`
-	Field9055     *bool        `protobuf:"varint,4,opt,name=field9055" json:"field9055,omitempty"`
-	Field9056     *int32       `protobuf:"varint,5,opt,name=field9056" json:"field9056,omitempty"`
-	Field9057     *int32       `protobuf:"varint,6,opt,name=field9057" json:"field9057,omitempty"`
-	Field9058     *int32       `protobuf:"varint,7,opt,name=field9058" json:"field9058,omitempty"`
-	Field9059     *float32     `protobuf:"fixed32,8,opt,name=field9059" json:"field9059,omitempty"`
-	Field9060     *float32     `protobuf:"fixed32,11,opt,name=field9060" json:"field9060,omitempty"`
-	Field9061     *float32     `protobuf:"fixed32,9,opt,name=field9061" json:"field9061,omitempty"`
-	Field9062     *float32     `protobuf:"fixed32,10,opt,name=field9062" json:"field9062,omitempty"`
-	Field9063     *float32     `protobuf:"fixed32,13,opt,name=field9063" json:"field9063,omitempty"`
-	Field9064     *bool        `protobuf:"varint,14,opt,name=field9064" json:"field9064,omitempty"`
-	Field9065     *float32     `protobuf:"fixed32,70,opt,name=field9065" json:"field9065,omitempty"`
-	Field9066     *int32       `protobuf:"varint,71,opt,name=field9066" json:"field9066,omitempty"`
-	Field9067     *Enum8945    `protobuf:"varint,15,opt,name=field9067,enum=benchmarks.google_message3.Enum8945" json:"field9067,omitempty"`
-	Field9068     *int32       `protobuf:"varint,16,opt,name=field9068" json:"field9068,omitempty"`
-	Field9069     *int32       `protobuf:"varint,17,opt,name=field9069" json:"field9069,omitempty"`
-	Field9070     *float32     `protobuf:"fixed32,18,opt,name=field9070" json:"field9070,omitempty"`
-	Field9071     *float32     `protobuf:"fixed32,19,opt,name=field9071" json:"field9071,omitempty"`
-	Field9072     *int32       `protobuf:"varint,28,opt,name=field9072" json:"field9072,omitempty"`
-	Field9073     *int32       `protobuf:"varint,29,opt,name=field9073" json:"field9073,omitempty"`
-	Field9074     *float32     `protobuf:"fixed32,60,opt,name=field9074" json:"field9074,omitempty"`
-	Field9075     *float32     `protobuf:"fixed32,61,opt,name=field9075" json:"field9075,omitempty"`
-	Field9076     *int32       `protobuf:"varint,72,opt,name=field9076" json:"field9076,omitempty"`
-	Field9077     *int32       `protobuf:"varint,73,opt,name=field9077" json:"field9077,omitempty"`
-	Field9078     *Enum8951    `protobuf:"varint,62,opt,name=field9078,enum=benchmarks.google_message3.Enum8951" json:"field9078,omitempty"`
-	Field9079     *string      `protobuf:"bytes,20,opt,name=field9079" json:"field9079,omitempty"`
-	Field9080     *string      `protobuf:"bytes,21,opt,name=field9080" json:"field9080,omitempty"`
-	Field9081     *string      `protobuf:"bytes,22,opt,name=field9081" json:"field9081,omitempty"`
-	Field9082     *float64     `protobuf:"fixed64,31,opt,name=field9082" json:"field9082,omitempty"`
-	Field9083     *float64     `protobuf:"fixed64,32,opt,name=field9083" json:"field9083,omitempty"`
-	Field9084     *float64     `protobuf:"fixed64,33,opt,name=field9084" json:"field9084,omitempty"`
-	Field9085     *float64     `protobuf:"fixed64,36,opt,name=field9085" json:"field9085,omitempty"`
-	Field9086     *UnusedEnum  `protobuf:"varint,37,opt,name=field9086,enum=benchmarks.google_message3.UnusedEnum" json:"field9086,omitempty"`
-	Field9087     *float64     `protobuf:"fixed64,38,opt,name=field9087" json:"field9087,omitempty"`
-	Field9088     *float64     `protobuf:"fixed64,39,opt,name=field9088" json:"field9088,omitempty"`
-	Field9089     *float64     `protobuf:"fixed64,63,opt,name=field9089" json:"field9089,omitempty"`
-	Field9090     *float64     `protobuf:"fixed64,64,opt,name=field9090" json:"field9090,omitempty"`
-	Field9091     *float64     `protobuf:"fixed64,65,opt,name=field9091" json:"field9091,omitempty"`
-	Field9092     *float64     `protobuf:"fixed64,34,opt,name=field9092" json:"field9092,omitempty"`
-	Field9093     *UnusedEnum  `protobuf:"varint,35,opt,name=field9093,enum=benchmarks.google_message3.UnusedEnum" json:"field9093,omitempty"`
-	Field9094     *UnusedEnum  `protobuf:"varint,66,opt,name=field9094,enum=benchmarks.google_message3.UnusedEnum" json:"field9094,omitempty"`
-	Field9095     *string      `protobuf:"bytes,40,opt,name=field9095" json:"field9095,omitempty"`
-	Field9096     *string      `protobuf:"bytes,41,opt,name=field9096" json:"field9096,omitempty"`
-	Field9097     *string      `protobuf:"bytes,42,opt,name=field9097" json:"field9097,omitempty"`
-	Field9098     *string      `protobuf:"bytes,43,opt,name=field9098" json:"field9098,omitempty"`
-	Field9099     *string      `protobuf:"bytes,44,opt,name=field9099" json:"field9099,omitempty"`
-	Field9100     *string      `protobuf:"bytes,45,opt,name=field9100" json:"field9100,omitempty"`
-	Field9101     *string      `protobuf:"bytes,46,opt,name=field9101" json:"field9101,omitempty"`
-	Field9102     *string      `protobuf:"bytes,47,opt,name=field9102" json:"field9102,omitempty"`
-	Field9103     *string      `protobuf:"bytes,48,opt,name=field9103" json:"field9103,omitempty"`
-	Field9104     *string      `protobuf:"bytes,49,opt,name=field9104" json:"field9104,omitempty"`
-	Field9105     *Message8939 `protobuf:"bytes,100,opt,name=field9105" json:"field9105,omitempty"`
-	Field9106     *int64       `protobuf:"varint,101,opt,name=field9106" json:"field9106,omitempty"`
+
+	Field9045 *string      `protobuf:"bytes,2,opt,name=field9045" json:"field9045,omitempty"`
+	Field9046 *string      `protobuf:"bytes,3,opt,name=field9046" json:"field9046,omitempty"`
+	Field9047 *string      `protobuf:"bytes,23,opt,name=field9047" json:"field9047,omitempty"`
+	Field9048 *string      `protobuf:"bytes,52,opt,name=field9048" json:"field9048,omitempty"`
+	Field9049 *int32       `protobuf:"varint,53,opt,name=field9049" json:"field9049,omitempty"`
+	Field9050 *int32       `protobuf:"varint,54,opt,name=field9050" json:"field9050,omitempty"`
+	Field9051 *float32     `protobuf:"fixed32,55,opt,name=field9051" json:"field9051,omitempty"`
+	Field9052 *float32     `protobuf:"fixed32,56,opt,name=field9052" json:"field9052,omitempty"`
+	Field9053 *string      `protobuf:"bytes,57,opt,name=field9053" json:"field9053,omitempty"`
+	Field9054 *int64       `protobuf:"varint,1,opt,name=field9054" json:"field9054,omitempty"`
+	Field9055 *bool        `protobuf:"varint,4,opt,name=field9055" json:"field9055,omitempty"`
+	Field9056 *int32       `protobuf:"varint,5,opt,name=field9056" json:"field9056,omitempty"`
+	Field9057 *int32       `protobuf:"varint,6,opt,name=field9057" json:"field9057,omitempty"`
+	Field9058 *int32       `protobuf:"varint,7,opt,name=field9058" json:"field9058,omitempty"`
+	Field9059 *float32     `protobuf:"fixed32,8,opt,name=field9059" json:"field9059,omitempty"`
+	Field9060 *float32     `protobuf:"fixed32,11,opt,name=field9060" json:"field9060,omitempty"`
+	Field9061 *float32     `protobuf:"fixed32,9,opt,name=field9061" json:"field9061,omitempty"`
+	Field9062 *float32     `protobuf:"fixed32,10,opt,name=field9062" json:"field9062,omitempty"`
+	Field9063 *float32     `protobuf:"fixed32,13,opt,name=field9063" json:"field9063,omitempty"`
+	Field9064 *bool        `protobuf:"varint,14,opt,name=field9064" json:"field9064,omitempty"`
+	Field9065 *float32     `protobuf:"fixed32,70,opt,name=field9065" json:"field9065,omitempty"`
+	Field9066 *int32       `protobuf:"varint,71,opt,name=field9066" json:"field9066,omitempty"`
+	Field9067 *Enum8945    `protobuf:"varint,15,opt,name=field9067,enum=benchmarks.google_message3.Enum8945" json:"field9067,omitempty"`
+	Field9068 *int32       `protobuf:"varint,16,opt,name=field9068" json:"field9068,omitempty"`
+	Field9069 *int32       `protobuf:"varint,17,opt,name=field9069" json:"field9069,omitempty"`
+	Field9070 *float32     `protobuf:"fixed32,18,opt,name=field9070" json:"field9070,omitempty"`
+	Field9071 *float32     `protobuf:"fixed32,19,opt,name=field9071" json:"field9071,omitempty"`
+	Field9072 *int32       `protobuf:"varint,28,opt,name=field9072" json:"field9072,omitempty"`
+	Field9073 *int32       `protobuf:"varint,29,opt,name=field9073" json:"field9073,omitempty"`
+	Field9074 *float32     `protobuf:"fixed32,60,opt,name=field9074" json:"field9074,omitempty"`
+	Field9075 *float32     `protobuf:"fixed32,61,opt,name=field9075" json:"field9075,omitempty"`
+	Field9076 *int32       `protobuf:"varint,72,opt,name=field9076" json:"field9076,omitempty"`
+	Field9077 *int32       `protobuf:"varint,73,opt,name=field9077" json:"field9077,omitempty"`
+	Field9078 *Enum8951    `protobuf:"varint,62,opt,name=field9078,enum=benchmarks.google_message3.Enum8951" json:"field9078,omitempty"`
+	Field9079 *string      `protobuf:"bytes,20,opt,name=field9079" json:"field9079,omitempty"`
+	Field9080 *string      `protobuf:"bytes,21,opt,name=field9080" json:"field9080,omitempty"`
+	Field9081 *string      `protobuf:"bytes,22,opt,name=field9081" json:"field9081,omitempty"`
+	Field9082 *float64     `protobuf:"fixed64,31,opt,name=field9082" json:"field9082,omitempty"`
+	Field9083 *float64     `protobuf:"fixed64,32,opt,name=field9083" json:"field9083,omitempty"`
+	Field9084 *float64     `protobuf:"fixed64,33,opt,name=field9084" json:"field9084,omitempty"`
+	Field9085 *float64     `protobuf:"fixed64,36,opt,name=field9085" json:"field9085,omitempty"`
+	Field9086 *UnusedEnum  `protobuf:"varint,37,opt,name=field9086,enum=benchmarks.google_message3.UnusedEnum" json:"field9086,omitempty"`
+	Field9087 *float64     `protobuf:"fixed64,38,opt,name=field9087" json:"field9087,omitempty"`
+	Field9088 *float64     `protobuf:"fixed64,39,opt,name=field9088" json:"field9088,omitempty"`
+	Field9089 *float64     `protobuf:"fixed64,63,opt,name=field9089" json:"field9089,omitempty"`
+	Field9090 *float64     `protobuf:"fixed64,64,opt,name=field9090" json:"field9090,omitempty"`
+	Field9091 *float64     `protobuf:"fixed64,65,opt,name=field9091" json:"field9091,omitempty"`
+	Field9092 *float64     `protobuf:"fixed64,34,opt,name=field9092" json:"field9092,omitempty"`
+	Field9093 *UnusedEnum  `protobuf:"varint,35,opt,name=field9093,enum=benchmarks.google_message3.UnusedEnum" json:"field9093,omitempty"`
+	Field9094 *UnusedEnum  `protobuf:"varint,66,opt,name=field9094,enum=benchmarks.google_message3.UnusedEnum" json:"field9094,omitempty"`
+	Field9095 *string      `protobuf:"bytes,40,opt,name=field9095" json:"field9095,omitempty"`
+	Field9096 *string      `protobuf:"bytes,41,opt,name=field9096" json:"field9096,omitempty"`
+	Field9097 *string      `protobuf:"bytes,42,opt,name=field9097" json:"field9097,omitempty"`
+	Field9098 *string      `protobuf:"bytes,43,opt,name=field9098" json:"field9098,omitempty"`
+	Field9099 *string      `protobuf:"bytes,44,opt,name=field9099" json:"field9099,omitempty"`
+	Field9100 *string      `protobuf:"bytes,45,opt,name=field9100" json:"field9100,omitempty"`
+	Field9101 *string      `protobuf:"bytes,46,opt,name=field9101" json:"field9101,omitempty"`
+	Field9102 *string      `protobuf:"bytes,47,opt,name=field9102" json:"field9102,omitempty"`
+	Field9103 *string      `protobuf:"bytes,48,opt,name=field9103" json:"field9103,omitempty"`
+	Field9104 *string      `protobuf:"bytes,49,opt,name=field9104" json:"field9104,omitempty"`
+	Field9105 *Message8939 `protobuf:"bytes,100,opt,name=field9105" json:"field9105,omitempty"`
+	Field9106 *int64       `protobuf:"varint,101,opt,name=field9106" json:"field9106,omitempty"`
 }
 
 func (x *Message8944) Reset() {
@@ -634,32 +636,33 @@ type Message9182 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field9205       *string               `protobuf:"bytes,1,opt,name=field9205" json:"field9205,omitempty"`
-	Field9206       *string               `protobuf:"bytes,2,opt,name=field9206" json:"field9206,omitempty"`
-	Field9207       *float32              `protobuf:"fixed32,16,opt,name=field9207" json:"field9207,omitempty"`
-	Field9208       *int32                `protobuf:"varint,17,opt,name=field9208" json:"field9208,omitempty"`
-	Field9209       *int32                `protobuf:"varint,27,opt,name=field9209" json:"field9209,omitempty"`
-	Field9210       *int32                `protobuf:"varint,7,opt,name=field9210" json:"field9210,omitempty"`
-	Field9211       *int32                `protobuf:"varint,8,opt,name=field9211" json:"field9211,omitempty"`
-	Field9212       *float32              `protobuf:"fixed32,26,opt,name=field9212" json:"field9212,omitempty"`
-	Field9213       *float32              `protobuf:"fixed32,22,opt,name=field9213" json:"field9213,omitempty"`
-	Field9214       *bool                 `protobuf:"varint,28,opt,name=field9214" json:"field9214,omitempty"`
-	Field9215       []*UnusedEmptyMessage `protobuf:"bytes,21,rep,name=field9215" json:"field9215,omitempty"`
-	Field9216       []*UnusedEmptyMessage `protobuf:"bytes,25,rep,name=field9216" json:"field9216,omitempty"`
-	Field9217       []*Message9181        `protobuf:"bytes,29,rep,name=field9217" json:"field9217,omitempty"`
-	Field9218       *bool                 `protobuf:"varint,18,opt,name=field9218" json:"field9218,omitempty"`
-	Field9219       *bool                 `protobuf:"varint,19,opt,name=field9219" json:"field9219,omitempty"`
-	Field9220       *bool                 `protobuf:"varint,20,opt,name=field9220" json:"field9220,omitempty"`
-	Field9221       *Message9164          `protobuf:"bytes,30,opt,name=field9221" json:"field9221,omitempty"`
-	Field9222       *Message9165          `protobuf:"bytes,31,opt,name=field9222" json:"field9222,omitempty"`
-	Field9223       *Message9166          `protobuf:"bytes,32,opt,name=field9223" json:"field9223,omitempty"`
-	Field9224       *float32              `protobuf:"fixed32,33,opt,name=field9224" json:"field9224,omitempty"`
-	Field9225       *Message9151          `protobuf:"bytes,34,opt,name=field9225" json:"field9225,omitempty"`
-	Field9226       *float32              `protobuf:"fixed32,35,opt,name=field9226" json:"field9226,omitempty"`
-	Field9227       *float32              `protobuf:"fixed32,36,opt,name=field9227" json:"field9227,omitempty"`
-	Field9228       *float32              `protobuf:"fixed32,37,opt,name=field9228" json:"field9228,omitempty"`
-	Field9229       *float32              `protobuf:"fixed32,38,opt,name=field9229" json:"field9229,omitempty"`
-	Field9230       *float32              `protobuf:"fixed32,39,opt,name=field9230" json:"field9230,omitempty"`
+
+	Field9205 *string               `protobuf:"bytes,1,opt,name=field9205" json:"field9205,omitempty"`
+	Field9206 *string               `protobuf:"bytes,2,opt,name=field9206" json:"field9206,omitempty"`
+	Field9207 *float32              `protobuf:"fixed32,16,opt,name=field9207" json:"field9207,omitempty"`
+	Field9208 *int32                `protobuf:"varint,17,opt,name=field9208" json:"field9208,omitempty"`
+	Field9209 *int32                `protobuf:"varint,27,opt,name=field9209" json:"field9209,omitempty"`
+	Field9210 *int32                `protobuf:"varint,7,opt,name=field9210" json:"field9210,omitempty"`
+	Field9211 *int32                `protobuf:"varint,8,opt,name=field9211" json:"field9211,omitempty"`
+	Field9212 *float32              `protobuf:"fixed32,26,opt,name=field9212" json:"field9212,omitempty"`
+	Field9213 *float32              `protobuf:"fixed32,22,opt,name=field9213" json:"field9213,omitempty"`
+	Field9214 *bool                 `protobuf:"varint,28,opt,name=field9214" json:"field9214,omitempty"`
+	Field9215 []*UnusedEmptyMessage `protobuf:"bytes,21,rep,name=field9215" json:"field9215,omitempty"`
+	Field9216 []*UnusedEmptyMessage `protobuf:"bytes,25,rep,name=field9216" json:"field9216,omitempty"`
+	Field9217 []*Message9181        `protobuf:"bytes,29,rep,name=field9217" json:"field9217,omitempty"`
+	Field9218 *bool                 `protobuf:"varint,18,opt,name=field9218" json:"field9218,omitempty"`
+	Field9219 *bool                 `protobuf:"varint,19,opt,name=field9219" json:"field9219,omitempty"`
+	Field9220 *bool                 `protobuf:"varint,20,opt,name=field9220" json:"field9220,omitempty"`
+	Field9221 *Message9164          `protobuf:"bytes,30,opt,name=field9221" json:"field9221,omitempty"`
+	Field9222 *Message9165          `protobuf:"bytes,31,opt,name=field9222" json:"field9222,omitempty"`
+	Field9223 *Message9166          `protobuf:"bytes,32,opt,name=field9223" json:"field9223,omitempty"`
+	Field9224 *float32              `protobuf:"fixed32,33,opt,name=field9224" json:"field9224,omitempty"`
+	Field9225 *Message9151          `protobuf:"bytes,34,opt,name=field9225" json:"field9225,omitempty"`
+	Field9226 *float32              `protobuf:"fixed32,35,opt,name=field9226" json:"field9226,omitempty"`
+	Field9227 *float32              `protobuf:"fixed32,36,opt,name=field9227" json:"field9227,omitempty"`
+	Field9228 *float32              `protobuf:"fixed32,37,opt,name=field9228" json:"field9228,omitempty"`
+	Field9229 *float32              `protobuf:"fixed32,38,opt,name=field9229" json:"field9229,omitempty"`
+	Field9230 *float32              `protobuf:"fixed32,39,opt,name=field9230" json:"field9230,omitempty"`
 }
 
 func (x *Message9182) Reset() {
@@ -888,8 +891,9 @@ type Message9160 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9161     *int32 `protobuf:"varint,1,opt,name=field9161" json:"field9161,omitempty"`
-	Field9162     []byte `protobuf:"bytes,2,opt,name=field9162" json:"field9162,omitempty"`
+
+	Field9161 *int32 `protobuf:"varint,1,opt,name=field9161" json:"field9161,omitempty"`
+	Field9162 []byte `protobuf:"bytes,2,opt,name=field9162" json:"field9162,omitempty"`
 }
 
 func (x *Message9160) Reset() {
@@ -937,7 +941,8 @@ type Message9242 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9327     []Enum9243 `protobuf:"varint,1,rep,name=field9327,enum=benchmarks.google_message3.Enum9243" json:"field9327,omitempty"`
+
+	Field9327 []Enum9243 `protobuf:"varint,1,rep,name=field9327,enum=benchmarks.google_message3.Enum9243" json:"field9327,omitempty"`
 }
 
 func (x *Message9242) Reset() {
@@ -978,7 +983,8 @@ type Message8890 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8916     []*Message8888 `protobuf:"bytes,1,rep,name=field8916" json:"field8916,omitempty"`
+
+	Field8916 []*Message8888 `protobuf:"bytes,1,rep,name=field8916" json:"field8916,omitempty"`
 }
 
 func (x *Message8890) Reset() {
@@ -1019,7 +1025,8 @@ type Message9123 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9135     *float32 `protobuf:"fixed32,1,opt,name=field9135" json:"field9135,omitempty"`
+
+	Field9135 *float32 `protobuf:"fixed32,1,opt,name=field9135" json:"field9135,omitempty"`
 }
 
 func (x *Message9123) Reset() {
@@ -1060,10 +1067,11 @@ type Message9628 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9673     *Message9627 `protobuf:"bytes,1,opt,name=field9673" json:"field9673,omitempty"`
-	Field9674     *string      `protobuf:"bytes,2,opt,name=field9674" json:"field9674,omitempty"`
-	Field9675     []int32      `protobuf:"varint,3,rep,name=field9675" json:"field9675,omitempty"`
-	Field9676     *int32       `protobuf:"varint,4,opt,name=field9676" json:"field9676,omitempty"`
+
+	Field9673 *Message9627 `protobuf:"bytes,1,opt,name=field9673" json:"field9673,omitempty"`
+	Field9674 *string      `protobuf:"bytes,2,opt,name=field9674" json:"field9674,omitempty"`
+	Field9675 []int32      `protobuf:"varint,3,rep,name=field9675" json:"field9675,omitempty"`
+	Field9676 *int32       `protobuf:"varint,4,opt,name=field9676" json:"field9676,omitempty"`
 }
 
 func (x *Message9628) Reset() {
@@ -1125,71 +1133,72 @@ type Message11014 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11780    *int32                `protobuf:"varint,40,opt,name=field11780" json:"field11780,omitempty"`
-	Field11781    *string               `protobuf:"bytes,46,opt,name=field11781" json:"field11781,omitempty"`
-	Field11782    *bool                 `protobuf:"varint,47,opt,name=field11782" json:"field11782,omitempty"`
-	Field11783    *Enum11107            `protobuf:"varint,1,opt,name=field11783,enum=benchmarks.google_message3.Enum11107" json:"field11783,omitempty"`
-	Field11784    *int32                `protobuf:"varint,2,opt,name=field11784" json:"field11784,omitempty"`
-	Field11785    *float64              `protobuf:"fixed64,4,opt,name=field11785" json:"field11785,omitempty"`
-	Field11786    *int32                `protobuf:"varint,5,opt,name=field11786" json:"field11786,omitempty"`
-	Field11787    *int32                `protobuf:"varint,6,opt,name=field11787" json:"field11787,omitempty"`
-	Field11788    *float64              `protobuf:"fixed64,7,opt,name=field11788" json:"field11788,omitempty"`
-	Field11789    *float64              `protobuf:"fixed64,8,opt,name=field11789" json:"field11789,omitempty"`
-	Field11790    *int64                `protobuf:"varint,9,opt,name=field11790" json:"field11790,omitempty"`
-	Field11791    *bool                 `protobuf:"varint,10,opt,name=field11791" json:"field11791,omitempty"`
-	Field11792    *int64                `protobuf:"varint,28,opt,name=field11792" json:"field11792,omitempty"`
-	Field11793    *bool                 `protobuf:"varint,37,opt,name=field11793" json:"field11793,omitempty"`
-	Field11794    *Enum11541            `protobuf:"varint,44,opt,name=field11794,enum=benchmarks.google_message3.Enum11541" json:"field11794,omitempty"`
-	Field11795    *float64              `protobuf:"fixed64,49,opt,name=field11795" json:"field11795,omitempty"`
-	Field11796    *float64              `protobuf:"fixed64,51,opt,name=field11796" json:"field11796,omitempty"`
-	Field11797    *int64                `protobuf:"varint,54,opt,name=field11797" json:"field11797,omitempty"`
-	Field11798    *int64                `protobuf:"varint,55,opt,name=field11798" json:"field11798,omitempty"`
-	Field11799    *UnusedEnum           `protobuf:"varint,57,opt,name=field11799,enum=benchmarks.google_message3.UnusedEnum" json:"field11799,omitempty"`
-	Field11800    *Enum11468            `protobuf:"varint,58,opt,name=field11800,enum=benchmarks.google_message3.Enum11468" json:"field11800,omitempty"`
-	Field11801    *int32                `protobuf:"varint,59,opt,name=field11801" json:"field11801,omitempty"`
-	Field11802    *UnusedEnum           `protobuf:"varint,60,opt,name=field11802,enum=benchmarks.google_message3.UnusedEnum" json:"field11802,omitempty"`
-	Field11803    *int32                `protobuf:"varint,61,opt,name=field11803" json:"field11803,omitempty"`
-	Field11804    *int32                `protobuf:"varint,62,opt,name=field11804" json:"field11804,omitempty"`
-	Field11805    *int32                `protobuf:"varint,69,opt,name=field11805" json:"field11805,omitempty"`
-	Field11806    *UnusedEmptyMessage   `protobuf:"bytes,68,opt,name=field11806" json:"field11806,omitempty"`
-	Field11807    []*Message11018       `protobuf:"bytes,71,rep,name=field11807" json:"field11807,omitempty"`
-	Field11808    *bool                 `protobuf:"varint,50,opt,name=field11808" json:"field11808,omitempty"`
-	Field11809    *bool                 `protobuf:"varint,56,opt,name=field11809" json:"field11809,omitempty"`
-	Field11810    *bool                 `protobuf:"varint,66,opt,name=field11810" json:"field11810,omitempty"`
-	Field11811    *bool                 `protobuf:"varint,63,opt,name=field11811" json:"field11811,omitempty"`
-	Field11812    *bool                 `protobuf:"varint,64,opt,name=field11812" json:"field11812,omitempty"`
-	Field11813    *bool                 `protobuf:"varint,65,opt,name=field11813" json:"field11813,omitempty"`
-	Field11814    *bool                 `protobuf:"varint,67,opt,name=field11814" json:"field11814,omitempty"`
-	Field11815    *Enum11107            `protobuf:"varint,15,opt,name=field11815,enum=benchmarks.google_message3.Enum11107" json:"field11815,omitempty"`
-	Field11816    *int64                `protobuf:"varint,16,opt,name=field11816" json:"field11816,omitempty"`
-	Field11817    *float64              `protobuf:"fixed64,17,opt,name=field11817" json:"field11817,omitempty"`
-	Field11818    *int64                `protobuf:"varint,18,opt,name=field11818" json:"field11818,omitempty"`
-	Field11819    *int32                `protobuf:"varint,19,opt,name=field11819" json:"field11819,omitempty"`
-	Field11820    *int64                `protobuf:"varint,20,opt,name=field11820" json:"field11820,omitempty"`
-	Field11821    *int32                `protobuf:"varint,42,opt,name=field11821" json:"field11821,omitempty"`
-	Field11822    *int64                `protobuf:"varint,52,opt,name=field11822" json:"field11822,omitempty"`
-	Field11823    *int64                `protobuf:"varint,53,opt,name=field11823" json:"field11823,omitempty"`
-	Field11824    *int64                `protobuf:"varint,41,opt,name=field11824" json:"field11824,omitempty"`
-	Field11825    *float64              `protobuf:"fixed64,48,opt,name=field11825" json:"field11825,omitempty"`
-	Field11826    []*Message11020       `protobuf:"bytes,70,rep,name=field11826" json:"field11826,omitempty"`
-	Field11827    []*UnusedEmptyMessage `protobuf:"bytes,72,rep,name=field11827" json:"field11827,omitempty"`
-	Field11828    *float64              `protobuf:"fixed64,25,opt,name=field11828" json:"field11828,omitempty"`
-	Field11829    *string               `protobuf:"bytes,26,opt,name=field11829" json:"field11829,omitempty"`
-	Field11830    *int64                `protobuf:"varint,27,opt,name=field11830" json:"field11830,omitempty"`
-	Field11831    *int64                `protobuf:"varint,32,opt,name=field11831" json:"field11831,omitempty"`
-	Field11832    *uint64               `protobuf:"varint,33,opt,name=field11832" json:"field11832,omitempty"`
-	Field11833    *bool                 `protobuf:"varint,29,opt,name=field11833" json:"field11833,omitempty"`
-	Field11834    *bool                 `protobuf:"varint,34,opt,name=field11834" json:"field11834,omitempty"`
-	Field11835    *string               `protobuf:"bytes,30,opt,name=field11835" json:"field11835,omitempty"`
-	Field11836    *int32                `protobuf:"varint,3,opt,name=field11836" json:"field11836,omitempty"`
-	Field11837    *int32                `protobuf:"varint,31,opt,name=field11837" json:"field11837,omitempty"`
-	Field11838    *int32                `protobuf:"varint,73,opt,name=field11838" json:"field11838,omitempty"`
-	Field11839    *int32                `protobuf:"varint,35,opt,name=field11839" json:"field11839,omitempty"`
-	Field11840    *Enum11022            `protobuf:"varint,36,opt,name=field11840,enum=benchmarks.google_message3.Enum11022" json:"field11840,omitempty"`
-	Field11841    *Message11013         `protobuf:"bytes,38,opt,name=field11841" json:"field11841,omitempty"`
-	Field11842    *float64              `protobuf:"fixed64,39,opt,name=field11842" json:"field11842,omitempty"`
-	Field11843    *int32                `protobuf:"varint,45,opt,name=field11843" json:"field11843,omitempty"`
-	Field11844    *bool                 `protobuf:"varint,74,opt,name=field11844" json:"field11844,omitempty"`
+
+	Field11780 *int32                `protobuf:"varint,40,opt,name=field11780" json:"field11780,omitempty"`
+	Field11781 *string               `protobuf:"bytes,46,opt,name=field11781" json:"field11781,omitempty"`
+	Field11782 *bool                 `protobuf:"varint,47,opt,name=field11782" json:"field11782,omitempty"`
+	Field11783 *Enum11107            `protobuf:"varint,1,opt,name=field11783,enum=benchmarks.google_message3.Enum11107" json:"field11783,omitempty"`
+	Field11784 *int32                `protobuf:"varint,2,opt,name=field11784" json:"field11784,omitempty"`
+	Field11785 *float64              `protobuf:"fixed64,4,opt,name=field11785" json:"field11785,omitempty"`
+	Field11786 *int32                `protobuf:"varint,5,opt,name=field11786" json:"field11786,omitempty"`
+	Field11787 *int32                `protobuf:"varint,6,opt,name=field11787" json:"field11787,omitempty"`
+	Field11788 *float64              `protobuf:"fixed64,7,opt,name=field11788" json:"field11788,omitempty"`
+	Field11789 *float64              `protobuf:"fixed64,8,opt,name=field11789" json:"field11789,omitempty"`
+	Field11790 *int64                `protobuf:"varint,9,opt,name=field11790" json:"field11790,omitempty"`
+	Field11791 *bool                 `protobuf:"varint,10,opt,name=field11791" json:"field11791,omitempty"`
+	Field11792 *int64                `protobuf:"varint,28,opt,name=field11792" json:"field11792,omitempty"`
+	Field11793 *bool                 `protobuf:"varint,37,opt,name=field11793" json:"field11793,omitempty"`
+	Field11794 *Enum11541            `protobuf:"varint,44,opt,name=field11794,enum=benchmarks.google_message3.Enum11541" json:"field11794,omitempty"`
+	Field11795 *float64              `protobuf:"fixed64,49,opt,name=field11795" json:"field11795,omitempty"`
+	Field11796 *float64              `protobuf:"fixed64,51,opt,name=field11796" json:"field11796,omitempty"`
+	Field11797 *int64                `protobuf:"varint,54,opt,name=field11797" json:"field11797,omitempty"`
+	Field11798 *int64                `protobuf:"varint,55,opt,name=field11798" json:"field11798,omitempty"`
+	Field11799 *UnusedEnum           `protobuf:"varint,57,opt,name=field11799,enum=benchmarks.google_message3.UnusedEnum" json:"field11799,omitempty"`
+	Field11800 *Enum11468            `protobuf:"varint,58,opt,name=field11800,enum=benchmarks.google_message3.Enum11468" json:"field11800,omitempty"`
+	Field11801 *int32                `protobuf:"varint,59,opt,name=field11801" json:"field11801,omitempty"`
+	Field11802 *UnusedEnum           `protobuf:"varint,60,opt,name=field11802,enum=benchmarks.google_message3.UnusedEnum" json:"field11802,omitempty"`
+	Field11803 *int32                `protobuf:"varint,61,opt,name=field11803" json:"field11803,omitempty"`
+	Field11804 *int32                `protobuf:"varint,62,opt,name=field11804" json:"field11804,omitempty"`
+	Field11805 *int32                `protobuf:"varint,69,opt,name=field11805" json:"field11805,omitempty"`
+	Field11806 *UnusedEmptyMessage   `protobuf:"bytes,68,opt,name=field11806" json:"field11806,omitempty"`
+	Field11807 []*Message11018       `protobuf:"bytes,71,rep,name=field11807" json:"field11807,omitempty"`
+	Field11808 *bool                 `protobuf:"varint,50,opt,name=field11808" json:"field11808,omitempty"`
+	Field11809 *bool                 `protobuf:"varint,56,opt,name=field11809" json:"field11809,omitempty"`
+	Field11810 *bool                 `protobuf:"varint,66,opt,name=field11810" json:"field11810,omitempty"`
+	Field11811 *bool                 `protobuf:"varint,63,opt,name=field11811" json:"field11811,omitempty"`
+	Field11812 *bool                 `protobuf:"varint,64,opt,name=field11812" json:"field11812,omitempty"`
+	Field11813 *bool                 `protobuf:"varint,65,opt,name=field11813" json:"field11813,omitempty"`
+	Field11814 *bool                 `protobuf:"varint,67,opt,name=field11814" json:"field11814,omitempty"`
+	Field11815 *Enum11107            `protobuf:"varint,15,opt,name=field11815,enum=benchmarks.google_message3.Enum11107" json:"field11815,omitempty"`
+	Field11816 *int64                `protobuf:"varint,16,opt,name=field11816" json:"field11816,omitempty"`
+	Field11817 *float64              `protobuf:"fixed64,17,opt,name=field11817" json:"field11817,omitempty"`
+	Field11818 *int64                `protobuf:"varint,18,opt,name=field11818" json:"field11818,omitempty"`
+	Field11819 *int32                `protobuf:"varint,19,opt,name=field11819" json:"field11819,omitempty"`
+	Field11820 *int64                `protobuf:"varint,20,opt,name=field11820" json:"field11820,omitempty"`
+	Field11821 *int32                `protobuf:"varint,42,opt,name=field11821" json:"field11821,omitempty"`
+	Field11822 *int64                `protobuf:"varint,52,opt,name=field11822" json:"field11822,omitempty"`
+	Field11823 *int64                `protobuf:"varint,53,opt,name=field11823" json:"field11823,omitempty"`
+	Field11824 *int64                `protobuf:"varint,41,opt,name=field11824" json:"field11824,omitempty"`
+	Field11825 *float64              `protobuf:"fixed64,48,opt,name=field11825" json:"field11825,omitempty"`
+	Field11826 []*Message11020       `protobuf:"bytes,70,rep,name=field11826" json:"field11826,omitempty"`
+	Field11827 []*UnusedEmptyMessage `protobuf:"bytes,72,rep,name=field11827" json:"field11827,omitempty"`
+	Field11828 *float64              `protobuf:"fixed64,25,opt,name=field11828" json:"field11828,omitempty"`
+	Field11829 *string               `protobuf:"bytes,26,opt,name=field11829" json:"field11829,omitempty"`
+	Field11830 *int64                `protobuf:"varint,27,opt,name=field11830" json:"field11830,omitempty"`
+	Field11831 *int64                `protobuf:"varint,32,opt,name=field11831" json:"field11831,omitempty"`
+	Field11832 *uint64               `protobuf:"varint,33,opt,name=field11832" json:"field11832,omitempty"`
+	Field11833 *bool                 `protobuf:"varint,29,opt,name=field11833" json:"field11833,omitempty"`
+	Field11834 *bool                 `protobuf:"varint,34,opt,name=field11834" json:"field11834,omitempty"`
+	Field11835 *string               `protobuf:"bytes,30,opt,name=field11835" json:"field11835,omitempty"`
+	Field11836 *int32                `protobuf:"varint,3,opt,name=field11836" json:"field11836,omitempty"`
+	Field11837 *int32                `protobuf:"varint,31,opt,name=field11837" json:"field11837,omitempty"`
+	Field11838 *int32                `protobuf:"varint,73,opt,name=field11838" json:"field11838,omitempty"`
+	Field11839 *int32                `protobuf:"varint,35,opt,name=field11839" json:"field11839,omitempty"`
+	Field11840 *Enum11022            `protobuf:"varint,36,opt,name=field11840,enum=benchmarks.google_message3.Enum11022" json:"field11840,omitempty"`
+	Field11841 *Message11013         `protobuf:"bytes,38,opt,name=field11841" json:"field11841,omitempty"`
+	Field11842 *float64              `protobuf:"fixed64,39,opt,name=field11842" json:"field11842,omitempty"`
+	Field11843 *int32                `protobuf:"varint,45,opt,name=field11843" json:"field11843,omitempty"`
+	Field11844 *bool                 `protobuf:"varint,74,opt,name=field11844" json:"field11844,omitempty"`
 }
 
 func (x *Message11014) Reset() {
@@ -1678,9 +1687,10 @@ type Message10801 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10812    *Message10800   `protobuf:"bytes,1,opt,name=field10812" json:"field10812,omitempty"`
-	Field10813    []*Message10802 `protobuf:"bytes,2,rep,name=field10813" json:"field10813,omitempty"`
-	Field10814    *int32          `protobuf:"varint,3,opt,name=field10814" json:"field10814,omitempty"`
+
+	Field10812 *Message10800   `protobuf:"bytes,1,opt,name=field10812" json:"field10812,omitempty"`
+	Field10813 []*Message10802 `protobuf:"bytes,2,rep,name=field10813" json:"field10813,omitempty"`
+	Field10814 *int32          `protobuf:"varint,3,opt,name=field10814" json:"field10814,omitempty"`
 }
 
 func (x *Message10801) Reset() {
@@ -1735,7 +1745,8 @@ type Message10749 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10754    []*Message10748 `protobuf:"bytes,1,rep,name=field10754" json:"field10754,omitempty"`
+
+	Field10754 []*Message10748 `protobuf:"bytes,1,rep,name=field10754" json:"field10754,omitempty"`
 }
 
 func (x *Message10749) Reset() {
@@ -1776,9 +1787,10 @@ type Message8298 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8321     *Message7966 `protobuf:"bytes,1,opt,name=field8321" json:"field8321,omitempty"`
-	Field8322     *int64       `protobuf:"varint,2,opt,name=field8322" json:"field8322,omitempty"`
-	Field8323     *string      `protobuf:"bytes,3,opt,name=field8323" json:"field8323,omitempty"`
+
+	Field8321 *Message7966 `protobuf:"bytes,1,opt,name=field8321" json:"field8321,omitempty"`
+	Field8322 *int64       `protobuf:"varint,2,opt,name=field8322" json:"field8322,omitempty"`
+	Field8323 *string      `protobuf:"bytes,3,opt,name=field8323" json:"field8323,omitempty"`
 }
 
 func (x *Message8298) Reset() {
@@ -1833,8 +1845,9 @@ type Message8300 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8326     *string      `protobuf:"bytes,1,opt,name=field8326" json:"field8326,omitempty"`
-	Field8327     *Message7966 `protobuf:"bytes,2,opt,name=field8327" json:"field8327,omitempty"`
+
+	Field8326 *string      `protobuf:"bytes,1,opt,name=field8326" json:"field8326,omitempty"`
+	Field8327 *Message7966 `protobuf:"bytes,2,opt,name=field8327" json:"field8327,omitempty"`
 }
 
 func (x *Message8300) Reset() {
@@ -1882,11 +1895,12 @@ type Message8291 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8306     *string   `protobuf:"bytes,1,opt,name=field8306" json:"field8306,omitempty"`
-	Field8307     *int32    `protobuf:"varint,2,opt,name=field8307" json:"field8307,omitempty"`
-	Field8308     *string   `protobuf:"bytes,3,opt,name=field8308" json:"field8308,omitempty"`
-	Field8309     *string   `protobuf:"bytes,4,opt,name=field8309" json:"field8309,omitempty"`
-	Field8310     *Enum8292 `protobuf:"varint,5,opt,name=field8310,enum=benchmarks.google_message3.Enum8292" json:"field8310,omitempty"`
+
+	Field8306 *string   `protobuf:"bytes,1,opt,name=field8306" json:"field8306,omitempty"`
+	Field8307 *int32    `protobuf:"varint,2,opt,name=field8307" json:"field8307,omitempty"`
+	Field8308 *string   `protobuf:"bytes,3,opt,name=field8308" json:"field8308,omitempty"`
+	Field8309 *string   `protobuf:"bytes,4,opt,name=field8309" json:"field8309,omitempty"`
+	Field8310 *Enum8292 `protobuf:"varint,5,opt,name=field8310,enum=benchmarks.google_message3.Enum8292" json:"field8310,omitempty"`
 }
 
 func (x *Message8291) Reset() {
@@ -1955,12 +1969,13 @@ type Message8296 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8311     *Message7966 `protobuf:"bytes,1,opt,name=field8311" json:"field8311,omitempty"`
-	Field8312     *string      `protobuf:"bytes,2,opt,name=field8312" json:"field8312,omitempty"`
-	Field8313     *Message7966 `protobuf:"bytes,3,opt,name=field8313" json:"field8313,omitempty"`
-	Field8314     *int32       `protobuf:"varint,4,opt,name=field8314" json:"field8314,omitempty"`
-	Field8315     *int32       `protobuf:"varint,5,opt,name=field8315" json:"field8315,omitempty"`
-	Field8316     *string      `protobuf:"bytes,6,opt,name=field8316" json:"field8316,omitempty"`
+
+	Field8311 *Message7966 `protobuf:"bytes,1,opt,name=field8311" json:"field8311,omitempty"`
+	Field8312 *string      `protobuf:"bytes,2,opt,name=field8312" json:"field8312,omitempty"`
+	Field8313 *Message7966 `protobuf:"bytes,3,opt,name=field8313" json:"field8313,omitempty"`
+	Field8314 *int32       `protobuf:"varint,4,opt,name=field8314" json:"field8314,omitempty"`
+	Field8315 *int32       `protobuf:"varint,5,opt,name=field8315" json:"field8315,omitempty"`
+	Field8316 *string      `protobuf:"bytes,6,opt,name=field8316" json:"field8316,omitempty"`
 }
 
 func (x *Message8296) Reset() {
@@ -2036,8 +2051,9 @@ type Message7965 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7967     *int32 `protobuf:"varint,1,opt,name=field7967" json:"field7967,omitempty"`
-	Field7968     *int32 `protobuf:"varint,2,opt,name=field7968" json:"field7968,omitempty"`
+
+	Field7967 *int32 `protobuf:"varint,1,opt,name=field7967" json:"field7967,omitempty"`
+	Field7968 *int32 `protobuf:"varint,2,opt,name=field7968" json:"field7968,omitempty"`
 }
 
 func (x *Message7965) Reset() {
@@ -2085,8 +2101,9 @@ type Message8290 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8304     *string `protobuf:"bytes,1,opt,name=field8304" json:"field8304,omitempty"`
-	Field8305     *string `protobuf:"bytes,2,opt,name=field8305" json:"field8305,omitempty"`
+
+	Field8304 *string `protobuf:"bytes,1,opt,name=field8304" json:"field8304,omitempty"`
+	Field8305 *string `protobuf:"bytes,2,opt,name=field8305" json:"field8305,omitempty"`
 }
 
 func (x *Message8290) Reset() {
@@ -2134,8 +2151,9 @@ type Message717 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field876      []string `protobuf:"bytes,1,rep,name=field876" json:"field876,omitempty"`
-	Field877      *float64 `protobuf:"fixed64,2,opt,name=field877" json:"field877,omitempty"`
+
+	Field876 []string `protobuf:"bytes,1,rep,name=field876" json:"field876,omitempty"`
+	Field877 *float64 `protobuf:"fixed64,2,opt,name=field877" json:"field877,omitempty"`
 }
 
 func (x *Message717) Reset() {
@@ -2183,8 +2201,9 @@ type Message713 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field852      *Message708 `protobuf:"bytes,1,req,name=field852" json:"field852,omitempty"`
-	Field853      []string    `protobuf:"bytes,2,rep,name=field853" json:"field853,omitempty"`
+
+	Field852 *Message708 `protobuf:"bytes,1,req,name=field852" json:"field852,omitempty"`
+	Field853 []string    `protobuf:"bytes,2,rep,name=field853" json:"field853,omitempty"`
 }
 
 func (x *Message713) Reset() {
@@ -2232,13 +2251,14 @@ type Message705 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field807      *string  `protobuf:"bytes,1,req,name=field807" json:"field807,omitempty"`
-	Field808      *string  `protobuf:"bytes,2,opt,name=field808" json:"field808,omitempty"`
-	Field809      *string  `protobuf:"bytes,3,opt,name=field809" json:"field809,omitempty"`
-	Field810      *bool    `protobuf:"varint,4,opt,name=field810" json:"field810,omitempty"`
-	Field811      *string  `protobuf:"bytes,5,opt,name=field811" json:"field811,omitempty"`
-	Field812      *string  `protobuf:"bytes,6,opt,name=field812" json:"field812,omitempty"`
-	Field813      []string `protobuf:"bytes,7,rep,name=field813" json:"field813,omitempty"`
+
+	Field807 *string  `protobuf:"bytes,1,req,name=field807" json:"field807,omitempty"`
+	Field808 *string  `protobuf:"bytes,2,opt,name=field808" json:"field808,omitempty"`
+	Field809 *string  `protobuf:"bytes,3,opt,name=field809" json:"field809,omitempty"`
+	Field810 *bool    `protobuf:"varint,4,opt,name=field810" json:"field810,omitempty"`
+	Field811 *string  `protobuf:"bytes,5,opt,name=field811" json:"field811,omitempty"`
+	Field812 *string  `protobuf:"bytes,6,opt,name=field812" json:"field812,omitempty"`
+	Field813 []string `protobuf:"bytes,7,rep,name=field813" json:"field813,omitempty"`
 }
 
 func (x *Message705) Reset() {
@@ -2321,11 +2341,12 @@ type Message709 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field829      []string `protobuf:"bytes,1,rep,name=field829" json:"field829,omitempty"`
-	Field830      []string `protobuf:"bytes,2,rep,name=field830" json:"field830,omitempty"`
-	Field831      []string `protobuf:"bytes,3,rep,name=field831" json:"field831,omitempty"`
-	Field832      []string `protobuf:"bytes,4,rep,name=field832" json:"field832,omitempty"`
-	Field833      []string `protobuf:"bytes,5,rep,name=field833" json:"field833,omitempty"`
+
+	Field829 []string `protobuf:"bytes,1,rep,name=field829" json:"field829,omitempty"`
+	Field830 []string `protobuf:"bytes,2,rep,name=field830" json:"field830,omitempty"`
+	Field831 []string `protobuf:"bytes,3,rep,name=field831" json:"field831,omitempty"`
+	Field832 []string `protobuf:"bytes,4,rep,name=field832" json:"field832,omitempty"`
+	Field833 []string `protobuf:"bytes,5,rep,name=field833" json:"field833,omitempty"`
 }
 
 func (x *Message709) Reset() {
@@ -2394,8 +2415,9 @@ type Message702 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field793      *string `protobuf:"bytes,1,opt,name=field793" json:"field793,omitempty"`
-	Field794      *string `protobuf:"bytes,2,opt,name=field794" json:"field794,omitempty"`
+
+	Field793 *string `protobuf:"bytes,1,opt,name=field793" json:"field793,omitempty"`
+	Field794 *string `protobuf:"bytes,2,opt,name=field794" json:"field794,omitempty"`
 }
 
 func (x *Message702) Reset() {
@@ -2443,11 +2465,12 @@ type Message714 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field854      *string `protobuf:"bytes,1,opt,name=field854" json:"field854,omitempty"`
-	Field855      *string `protobuf:"bytes,2,opt,name=field855" json:"field855,omitempty"`
-	Field856      *string `protobuf:"bytes,3,opt,name=field856" json:"field856,omitempty"`
-	Field857      *string `protobuf:"bytes,4,opt,name=field857" json:"field857,omitempty"`
-	Field858      *uint32 `protobuf:"varint,5,opt,name=field858" json:"field858,omitempty"`
+
+	Field854 *string `protobuf:"bytes,1,opt,name=field854" json:"field854,omitempty"`
+	Field855 *string `protobuf:"bytes,2,opt,name=field855" json:"field855,omitempty"`
+	Field856 *string `protobuf:"bytes,3,opt,name=field856" json:"field856,omitempty"`
+	Field857 *string `protobuf:"bytes,4,opt,name=field857" json:"field857,omitempty"`
+	Field858 *uint32 `protobuf:"varint,5,opt,name=field858" json:"field858,omitempty"`
 }
 
 func (x *Message714) Reset() {
@@ -2516,11 +2539,12 @@ type Message710 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field834      []string `protobuf:"bytes,1,rep,name=field834" json:"field834,omitempty"`
-	Field835      *string  `protobuf:"bytes,2,opt,name=field835" json:"field835,omitempty"`
-	Field836      *string  `protobuf:"bytes,3,opt,name=field836" json:"field836,omitempty"`
-	Field837      []string `protobuf:"bytes,4,rep,name=field837" json:"field837,omitempty"`
-	Field838      []string `protobuf:"bytes,5,rep,name=field838" json:"field838,omitempty"`
+
+	Field834 []string `protobuf:"bytes,1,rep,name=field834" json:"field834,omitempty"`
+	Field835 *string  `protobuf:"bytes,2,opt,name=field835" json:"field835,omitempty"`
+	Field836 *string  `protobuf:"bytes,3,opt,name=field836" json:"field836,omitempty"`
+	Field837 []string `protobuf:"bytes,4,rep,name=field837" json:"field837,omitempty"`
+	Field838 []string `protobuf:"bytes,5,rep,name=field838" json:"field838,omitempty"`
 }
 
 func (x *Message710) Reset() {
@@ -2589,10 +2613,11 @@ type Message706 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field814      []string `protobuf:"bytes,1,rep,name=field814" json:"field814,omitempty"`
-	Field815      *string  `protobuf:"bytes,2,opt,name=field815" json:"field815,omitempty"`
-	Field816      []string `protobuf:"bytes,3,rep,name=field816" json:"field816,omitempty"`
-	Field817      []string `protobuf:"bytes,4,rep,name=field817" json:"field817,omitempty"`
+
+	Field814 []string `protobuf:"bytes,1,rep,name=field814" json:"field814,omitempty"`
+	Field815 *string  `protobuf:"bytes,2,opt,name=field815" json:"field815,omitempty"`
+	Field816 []string `protobuf:"bytes,3,rep,name=field816" json:"field816,omitempty"`
+	Field817 []string `protobuf:"bytes,4,rep,name=field817" json:"field817,omitempty"`
 }
 
 func (x *Message706) Reset() {
@@ -2654,11 +2679,12 @@ type Message707 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field818      *string  `protobuf:"bytes,1,req,name=field818" json:"field818,omitempty"`
-	Field819      *string  `protobuf:"bytes,2,req,name=field819" json:"field819,omitempty"`
-	Field820      *string  `protobuf:"bytes,3,req,name=field820" json:"field820,omitempty"`
-	Field821      *bool    `protobuf:"varint,4,opt,name=field821" json:"field821,omitempty"`
-	Field822      []string `protobuf:"bytes,5,rep,name=field822" json:"field822,omitempty"`
+
+	Field818 *string  `protobuf:"bytes,1,req,name=field818" json:"field818,omitempty"`
+	Field819 *string  `protobuf:"bytes,2,req,name=field819" json:"field819,omitempty"`
+	Field820 *string  `protobuf:"bytes,3,req,name=field820" json:"field820,omitempty"`
+	Field821 *bool    `protobuf:"varint,4,opt,name=field821" json:"field821,omitempty"`
+	Field822 []string `protobuf:"bytes,5,rep,name=field822" json:"field822,omitempty"`
 }
 
 func (x *Message707) Reset() {
@@ -2727,10 +2753,11 @@ type Message711 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field839      *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field839" json:"field839,omitempty"`
-	Field840      []string            `protobuf:"bytes,4,rep,name=field840" json:"field840,omitempty"`
-	Field841      []string            `protobuf:"bytes,2,rep,name=field841" json:"field841,omitempty"`
-	Field842      []string            `protobuf:"bytes,3,rep,name=field842" json:"field842,omitempty"`
+
+	Field839 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field839" json:"field839,omitempty"`
+	Field840 []string            `protobuf:"bytes,4,rep,name=field840" json:"field840,omitempty"`
+	Field841 []string            `protobuf:"bytes,2,rep,name=field841" json:"field841,omitempty"`
+	Field842 []string            `protobuf:"bytes,3,rep,name=field842" json:"field842,omitempty"`
 }
 
 func (x *Message711) Reset() {
@@ -2792,15 +2819,16 @@ type Message712 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field843      []string `protobuf:"bytes,1,rep,name=field843" json:"field843,omitempty"`
-	Field844      *string  `protobuf:"bytes,2,req,name=field844" json:"field844,omitempty"`
-	Field845      *string  `protobuf:"bytes,3,opt,name=field845" json:"field845,omitempty"`
-	Field846      []string `protobuf:"bytes,4,rep,name=field846" json:"field846,omitempty"`
-	Field847      []string `protobuf:"bytes,5,rep,name=field847" json:"field847,omitempty"`
-	Field848      *string  `protobuf:"bytes,6,opt,name=field848" json:"field848,omitempty"`
-	Field849      []string `protobuf:"bytes,7,rep,name=field849" json:"field849,omitempty"`
-	Field850      *string  `protobuf:"bytes,8,opt,name=field850" json:"field850,omitempty"`
-	Field851      *string  `protobuf:"bytes,9,opt,name=field851" json:"field851,omitempty"`
+
+	Field843 []string `protobuf:"bytes,1,rep,name=field843" json:"field843,omitempty"`
+	Field844 *string  `protobuf:"bytes,2,req,name=field844" json:"field844,omitempty"`
+	Field845 *string  `protobuf:"bytes,3,opt,name=field845" json:"field845,omitempty"`
+	Field846 []string `protobuf:"bytes,4,rep,name=field846" json:"field846,omitempty"`
+	Field847 []string `protobuf:"bytes,5,rep,name=field847" json:"field847,omitempty"`
+	Field848 *string  `protobuf:"bytes,6,opt,name=field848" json:"field848,omitempty"`
+	Field849 []string `protobuf:"bytes,7,rep,name=field849" json:"field849,omitempty"`
+	Field850 *string  `protobuf:"bytes,8,opt,name=field850" json:"field850,omitempty"`
+	Field851 *string  `protobuf:"bytes,9,opt,name=field851" json:"field851,omitempty"`
 }
 
 func (x *Message712) Reset() {
@@ -2897,28 +2925,29 @@ type Message8939 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9010     *string                    `protobuf:"bytes,1,opt,name=field9010" json:"field9010,omitempty"`
-	Field9011     *string                    `protobuf:"bytes,2,opt,name=field9011" json:"field9011,omitempty"`
-	Field9012     *string                    `protobuf:"bytes,3,opt,name=field9012" json:"field9012,omitempty"`
-	Field9013     []string                   `protobuf:"bytes,4,rep,name=field9013" json:"field9013,omitempty"`
-	Field9014     *string                    `protobuf:"bytes,5,opt,name=field9014" json:"field9014,omitempty"`
-	Message8940   []*Message8939_Message8940 `protobuf:"group,11,rep,name=Message8940,json=message8940" json:"message8940,omitempty"`
-	Field9016     *int64                     `protobuf:"varint,21,opt,name=field9016" json:"field9016,omitempty"`
-	Field9017     *int64                     `protobuf:"varint,22,opt,name=field9017" json:"field9017,omitempty"`
-	Field9018     *int64                     `protobuf:"varint,23,opt,name=field9018" json:"field9018,omitempty"`
-	Message8941   *Message8939_Message8941   `protobuf:"group,31,opt,name=Message8941,json=message8941" json:"message8941,omitempty"`
-	Field9020     *Message8942               `protobuf:"bytes,38,opt,name=field9020" json:"field9020,omitempty"`
-	Field9021     []*UnusedEmptyMessage      `protobuf:"bytes,39,rep,name=field9021" json:"field9021,omitempty"`
-	Field9022     []string                   `protobuf:"bytes,41,rep,name=field9022" json:"field9022,omitempty"`
-	Field9023     *string                    `protobuf:"bytes,42,opt,name=field9023" json:"field9023,omitempty"`
-	Field9024     *string                    `protobuf:"bytes,43,opt,name=field9024" json:"field9024,omitempty"`
-	Field9025     *string                    `protobuf:"bytes,44,opt,name=field9025" json:"field9025,omitempty"`
-	Field9026     *string                    `protobuf:"bytes,45,opt,name=field9026" json:"field9026,omitempty"`
-	Field9027     *string                    `protobuf:"bytes,46,opt,name=field9027" json:"field9027,omitempty"`
-	Field9028     *string                    `protobuf:"bytes,47,opt,name=field9028" json:"field9028,omitempty"`
-	Field9029     *UnusedEnum                `protobuf:"varint,48,opt,name=field9029,enum=benchmarks.google_message3.UnusedEnum" json:"field9029,omitempty"`
-	Field9030     *UnusedEnum                `protobuf:"varint,49,opt,name=field9030,enum=benchmarks.google_message3.UnusedEnum" json:"field9030,omitempty"`
-	Message8943   *Message8939_Message8943   `protobuf:"group,51,opt,name=Message8943,json=message8943" json:"message8943,omitempty"`
+
+	Field9010   *string                    `protobuf:"bytes,1,opt,name=field9010" json:"field9010,omitempty"`
+	Field9011   *string                    `protobuf:"bytes,2,opt,name=field9011" json:"field9011,omitempty"`
+	Field9012   *string                    `protobuf:"bytes,3,opt,name=field9012" json:"field9012,omitempty"`
+	Field9013   []string                   `protobuf:"bytes,4,rep,name=field9013" json:"field9013,omitempty"`
+	Field9014   *string                    `protobuf:"bytes,5,opt,name=field9014" json:"field9014,omitempty"`
+	Message8940 []*Message8939_Message8940 `protobuf:"group,11,rep,name=Message8940,json=message8940" json:"message8940,omitempty"`
+	Field9016   *int64                     `protobuf:"varint,21,opt,name=field9016" json:"field9016,omitempty"`
+	Field9017   *int64                     `protobuf:"varint,22,opt,name=field9017" json:"field9017,omitempty"`
+	Field9018   *int64                     `protobuf:"varint,23,opt,name=field9018" json:"field9018,omitempty"`
+	Message8941 *Message8939_Message8941   `protobuf:"group,31,opt,name=Message8941,json=message8941" json:"message8941,omitempty"`
+	Field9020   *Message8942               `protobuf:"bytes,38,opt,name=field9020" json:"field9020,omitempty"`
+	Field9021   []*UnusedEmptyMessage      `protobuf:"bytes,39,rep,name=field9021" json:"field9021,omitempty"`
+	Field9022   []string                   `protobuf:"bytes,41,rep,name=field9022" json:"field9022,omitempty"`
+	Field9023   *string                    `protobuf:"bytes,42,opt,name=field9023" json:"field9023,omitempty"`
+	Field9024   *string                    `protobuf:"bytes,43,opt,name=field9024" json:"field9024,omitempty"`
+	Field9025   *string                    `protobuf:"bytes,44,opt,name=field9025" json:"field9025,omitempty"`
+	Field9026   *string                    `protobuf:"bytes,45,opt,name=field9026" json:"field9026,omitempty"`
+	Field9027   *string                    `protobuf:"bytes,46,opt,name=field9027" json:"field9027,omitempty"`
+	Field9028   *string                    `protobuf:"bytes,47,opt,name=field9028" json:"field9028,omitempty"`
+	Field9029   *UnusedEnum                `protobuf:"varint,48,opt,name=field9029,enum=benchmarks.google_message3.UnusedEnum" json:"field9029,omitempty"`
+	Field9030   *UnusedEnum                `protobuf:"varint,49,opt,name=field9030,enum=benchmarks.google_message3.UnusedEnum" json:"field9030,omitempty"`
+	Message8943 *Message8939_Message8943   `protobuf:"group,51,opt,name=Message8943,json=message8943" json:"message8943,omitempty"`
 }
 
 func (x *Message8939) Reset() {
@@ -3106,7 +3135,8 @@ type Message9181 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9204     *string `protobuf:"bytes,1,opt,name=field9204" json:"field9204,omitempty"`
+
+	Field9204 *string `protobuf:"bytes,1,opt,name=field9204" json:"field9204,omitempty"`
 }
 
 func (x *Message9181) Reset() {
@@ -3147,9 +3177,10 @@ type Message9164 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9168     *int32 `protobuf:"varint,1,opt,name=field9168" json:"field9168,omitempty"`
-	Field9169     *int32 `protobuf:"varint,2,opt,name=field9169" json:"field9169,omitempty"`
-	Field9170     *int32 `protobuf:"varint,3,opt,name=field9170" json:"field9170,omitempty"`
+
+	Field9168 *int32 `protobuf:"varint,1,opt,name=field9168" json:"field9168,omitempty"`
+	Field9169 *int32 `protobuf:"varint,2,opt,name=field9169" json:"field9169,omitempty"`
+	Field9170 *int32 `protobuf:"varint,3,opt,name=field9170" json:"field9170,omitempty"`
 }
 
 func (x *Message9164) Reset() {
@@ -3204,8 +3235,9 @@ type Message9165 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9171     *float32 `protobuf:"fixed32,1,opt,name=field9171" json:"field9171,omitempty"`
-	Field9172     *float32 `protobuf:"fixed32,2,opt,name=field9172" json:"field9172,omitempty"`
+
+	Field9171 *float32 `protobuf:"fixed32,1,opt,name=field9171" json:"field9171,omitempty"`
+	Field9172 *float32 `protobuf:"fixed32,2,opt,name=field9172" json:"field9172,omitempty"`
 }
 
 func (x *Message9165) Reset() {
@@ -3253,8 +3285,9 @@ type Message9166 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9173     *float32 `protobuf:"fixed32,1,opt,name=field9173" json:"field9173,omitempty"`
-	Field9174     *int32   `protobuf:"varint,2,opt,name=field9174" json:"field9174,omitempty"`
+
+	Field9173 *float32 `protobuf:"fixed32,1,opt,name=field9173" json:"field9173,omitempty"`
+	Field9174 *int32   `protobuf:"varint,2,opt,name=field9174" json:"field9174,omitempty"`
 }
 
 func (x *Message9166) Reset() {
@@ -3302,14 +3335,15 @@ type Message9151 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9152     *float64 `protobuf:"fixed64,1,opt,name=field9152" json:"field9152,omitempty"`
-	Field9153     *float64 `protobuf:"fixed64,2,opt,name=field9153" json:"field9153,omitempty"`
-	Field9154     *float32 `protobuf:"fixed32,3,opt,name=field9154" json:"field9154,omitempty"`
-	Field9155     *float32 `protobuf:"fixed32,4,opt,name=field9155" json:"field9155,omitempty"`
-	Field9156     *float32 `protobuf:"fixed32,5,opt,name=field9156" json:"field9156,omitempty"`
-	Field9157     *float32 `protobuf:"fixed32,6,opt,name=field9157" json:"field9157,omitempty"`
-	Field9158     *float32 `protobuf:"fixed32,7,opt,name=field9158" json:"field9158,omitempty"`
-	Field9159     *float32 `protobuf:"fixed32,8,opt,name=field9159" json:"field9159,omitempty"`
+
+	Field9152 *float64 `protobuf:"fixed64,1,opt,name=field9152" json:"field9152,omitempty"`
+	Field9153 *float64 `protobuf:"fixed64,2,opt,name=field9153" json:"field9153,omitempty"`
+	Field9154 *float32 `protobuf:"fixed32,3,opt,name=field9154" json:"field9154,omitempty"`
+	Field9155 *float32 `protobuf:"fixed32,4,opt,name=field9155" json:"field9155,omitempty"`
+	Field9156 *float32 `protobuf:"fixed32,5,opt,name=field9156" json:"field9156,omitempty"`
+	Field9157 *float32 `protobuf:"fixed32,6,opt,name=field9157" json:"field9157,omitempty"`
+	Field9158 *float32 `protobuf:"fixed32,7,opt,name=field9158" json:"field9158,omitempty"`
+	Field9159 *float32 `protobuf:"fixed32,8,opt,name=field9159" json:"field9159,omitempty"`
 }
 
 func (x *Message9151) Reset() {
@@ -3399,10 +3433,11 @@ type Message8888 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8908     *int32    `protobuf:"varint,1,opt,name=field8908" json:"field8908,omitempty"`
-	Field8909     *Enum8900 `protobuf:"varint,4,opt,name=field8909,enum=benchmarks.google_message3.Enum8900" json:"field8909,omitempty"`
-	Field8910     []int32   `protobuf:"varint,2,rep,packed,name=field8910" json:"field8910,omitempty"`
-	Field8911     []byte    `protobuf:"bytes,3,opt,name=field8911" json:"field8911,omitempty"`
+
+	Field8908 *int32    `protobuf:"varint,1,opt,name=field8908" json:"field8908,omitempty"`
+	Field8909 *Enum8900 `protobuf:"varint,4,opt,name=field8909,enum=benchmarks.google_message3.Enum8900" json:"field8909,omitempty"`
+	Field8910 []int32   `protobuf:"varint,2,rep,packed,name=field8910" json:"field8910,omitempty"`
+	Field8911 []byte    `protobuf:"bytes,3,opt,name=field8911" json:"field8911,omitempty"`
 }
 
 func (x *Message8888) Reset() {
@@ -3464,11 +3499,12 @@ type Message9627 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9668     *int32   `protobuf:"varint,1,req,name=field9668" json:"field9668,omitempty"`
-	Field9669     *int32   `protobuf:"varint,2,req,name=field9669" json:"field9669,omitempty"`
-	Field9670     *int32   `protobuf:"varint,3,req,name=field9670" json:"field9670,omitempty"`
-	Field9671     *int32   `protobuf:"varint,4,req,name=field9671" json:"field9671,omitempty"`
-	Field9672     *float32 `protobuf:"fixed32,5,opt,name=field9672" json:"field9672,omitempty"`
+
+	Field9668 *int32   `protobuf:"varint,1,req,name=field9668" json:"field9668,omitempty"`
+	Field9669 *int32   `protobuf:"varint,2,req,name=field9669" json:"field9669,omitempty"`
+	Field9670 *int32   `protobuf:"varint,3,req,name=field9670" json:"field9670,omitempty"`
+	Field9671 *int32   `protobuf:"varint,4,req,name=field9671" json:"field9671,omitempty"`
+	Field9672 *float32 `protobuf:"fixed32,5,opt,name=field9672" json:"field9672,omitempty"`
 }
 
 func (x *Message9627) Reset() {
@@ -3570,29 +3606,30 @@ type Message11013 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11757    []byte              `protobuf:"bytes,19,opt,name=field11757" json:"field11757,omitempty"`
-	Field11758    []byte              `protobuf:"bytes,1,opt,name=field11758" json:"field11758,omitempty"`
-	Field11759    []byte              `protobuf:"bytes,2,opt,name=field11759" json:"field11759,omitempty"`
-	Field11760    []byte              `protobuf:"bytes,3,opt,name=field11760" json:"field11760,omitempty"`
-	Field11761    []byte              `protobuf:"bytes,4,opt,name=field11761" json:"field11761,omitempty"`
-	Field11762    []byte              `protobuf:"bytes,5,opt,name=field11762" json:"field11762,omitempty"`
-	Field11763    []byte              `protobuf:"bytes,6,opt,name=field11763" json:"field11763,omitempty"`
-	Field11764    []byte              `protobuf:"bytes,7,opt,name=field11764" json:"field11764,omitempty"`
-	Field11765    []byte              `protobuf:"bytes,8,opt,name=field11765" json:"field11765,omitempty"`
-	Field11766    []byte              `protobuf:"bytes,9,opt,name=field11766" json:"field11766,omitempty"`
-	Field11767    []byte              `protobuf:"bytes,10,opt,name=field11767" json:"field11767,omitempty"`
-	Field11768    []byte              `protobuf:"bytes,11,opt,name=field11768" json:"field11768,omitempty"`
-	Field11769    []byte              `protobuf:"bytes,12,opt,name=field11769" json:"field11769,omitempty"`
-	Field11770    []byte              `protobuf:"bytes,13,opt,name=field11770" json:"field11770,omitempty"`
-	Field11771    []byte              `protobuf:"bytes,14,opt,name=field11771" json:"field11771,omitempty"`
-	Field11772    []byte              `protobuf:"bytes,15,opt,name=field11772" json:"field11772,omitempty"`
-	Field11773    []byte              `protobuf:"bytes,16,opt,name=field11773" json:"field11773,omitempty"`
-	Field11774    []byte              `protobuf:"bytes,17,opt,name=field11774" json:"field11774,omitempty"`
-	Field11775    []byte              `protobuf:"bytes,18,opt,name=field11775" json:"field11775,omitempty"`
-	Field11776    []byte              `protobuf:"bytes,20,opt,name=field11776" json:"field11776,omitempty"`
-	Field11777    []byte              `protobuf:"bytes,21,opt,name=field11777" json:"field11777,omitempty"`
-	Field11778    *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field11778" json:"field11778,omitempty"`
-	Field11779    []*Message11011     `protobuf:"bytes,22,rep,name=field11779" json:"field11779,omitempty"`
+
+	Field11757 []byte              `protobuf:"bytes,19,opt,name=field11757" json:"field11757,omitempty"`
+	Field11758 []byte              `protobuf:"bytes,1,opt,name=field11758" json:"field11758,omitempty"`
+	Field11759 []byte              `protobuf:"bytes,2,opt,name=field11759" json:"field11759,omitempty"`
+	Field11760 []byte              `protobuf:"bytes,3,opt,name=field11760" json:"field11760,omitempty"`
+	Field11761 []byte              `protobuf:"bytes,4,opt,name=field11761" json:"field11761,omitempty"`
+	Field11762 []byte              `protobuf:"bytes,5,opt,name=field11762" json:"field11762,omitempty"`
+	Field11763 []byte              `protobuf:"bytes,6,opt,name=field11763" json:"field11763,omitempty"`
+	Field11764 []byte              `protobuf:"bytes,7,opt,name=field11764" json:"field11764,omitempty"`
+	Field11765 []byte              `protobuf:"bytes,8,opt,name=field11765" json:"field11765,omitempty"`
+	Field11766 []byte              `protobuf:"bytes,9,opt,name=field11766" json:"field11766,omitempty"`
+	Field11767 []byte              `protobuf:"bytes,10,opt,name=field11767" json:"field11767,omitempty"`
+	Field11768 []byte              `protobuf:"bytes,11,opt,name=field11768" json:"field11768,omitempty"`
+	Field11769 []byte              `protobuf:"bytes,12,opt,name=field11769" json:"field11769,omitempty"`
+	Field11770 []byte              `protobuf:"bytes,13,opt,name=field11770" json:"field11770,omitempty"`
+	Field11771 []byte              `protobuf:"bytes,14,opt,name=field11771" json:"field11771,omitempty"`
+	Field11772 []byte              `protobuf:"bytes,15,opt,name=field11772" json:"field11772,omitempty"`
+	Field11773 []byte              `protobuf:"bytes,16,opt,name=field11773" json:"field11773,omitempty"`
+	Field11774 []byte              `protobuf:"bytes,17,opt,name=field11774" json:"field11774,omitempty"`
+	Field11775 []byte              `protobuf:"bytes,18,opt,name=field11775" json:"field11775,omitempty"`
+	Field11776 []byte              `protobuf:"bytes,20,opt,name=field11776" json:"field11776,omitempty"`
+	Field11777 []byte              `protobuf:"bytes,21,opt,name=field11777" json:"field11777,omitempty"`
+	Field11778 *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field11778" json:"field11778,omitempty"`
+	Field11779 []*Message11011     `protobuf:"bytes,22,rep,name=field11779" json:"field11779,omitempty"`
 }
 
 func (x *Message11013) Reset() {
@@ -3820,12 +3857,13 @@ type Message8939_Message8941 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9033     *string `protobuf:"bytes,32,opt,name=field9033" json:"field9033,omitempty"`
-	Field9034     *string `protobuf:"bytes,33,opt,name=field9034" json:"field9034,omitempty"`
-	Field9035     *string `protobuf:"bytes,34,opt,name=field9035" json:"field9035,omitempty"`
-	Field9036     *string `protobuf:"bytes,35,opt,name=field9036" json:"field9036,omitempty"`
-	Field9037     *string `protobuf:"bytes,36,opt,name=field9037" json:"field9037,omitempty"`
-	Field9038     *string `protobuf:"bytes,37,opt,name=field9038" json:"field9038,omitempty"`
+
+	Field9033 *string `protobuf:"bytes,32,opt,name=field9033" json:"field9033,omitempty"`
+	Field9034 *string `protobuf:"bytes,33,opt,name=field9034" json:"field9034,omitempty"`
+	Field9035 *string `protobuf:"bytes,34,opt,name=field9035" json:"field9035,omitempty"`
+	Field9036 *string `protobuf:"bytes,35,opt,name=field9036" json:"field9036,omitempty"`
+	Field9037 *string `protobuf:"bytes,36,opt,name=field9037" json:"field9037,omitempty"`
+	Field9038 *string `protobuf:"bytes,37,opt,name=field9038" json:"field9038,omitempty"`
 }
 
 func (x *Message8939_Message8941) Reset() {
@@ -3901,12 +3939,13 @@ type Message8939_Message8943 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field9039     *string `protobuf:"bytes,1,opt,name=field9039" json:"field9039,omitempty"`
-	Field9040     *string `protobuf:"bytes,2,opt,name=field9040" json:"field9040,omitempty"`
-	Field9041     *string `protobuf:"bytes,3,opt,name=field9041" json:"field9041,omitempty"`
-	Field9042     *string `protobuf:"bytes,4,opt,name=field9042" json:"field9042,omitempty"`
-	Field9043     *string `protobuf:"bytes,5,opt,name=field9043" json:"field9043,omitempty"`
-	Field9044     *string `protobuf:"bytes,6,opt,name=field9044" json:"field9044,omitempty"`
+
+	Field9039 *string `protobuf:"bytes,1,opt,name=field9039" json:"field9039,omitempty"`
+	Field9040 *string `protobuf:"bytes,2,opt,name=field9040" json:"field9040,omitempty"`
+	Field9041 *string `protobuf:"bytes,3,opt,name=field9041" json:"field9041,omitempty"`
+	Field9042 *string `protobuf:"bytes,4,opt,name=field9042" json:"field9042,omitempty"`
+	Field9043 *string `protobuf:"bytes,5,opt,name=field9043" json:"field9043,omitempty"`
+	Field9044 *string `protobuf:"bytes,6,opt,name=field9044" json:"field9044,omitempty"`
 }
 
 func (x *Message8939_Message8943) Reset() {

internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go

@@ -54,10 +54,11 @@ type Message10800 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10808    *string  `protobuf:"bytes,1,opt,name=field10808" json:"field10808,omitempty"`
-	Field10809    *int64   `protobuf:"varint,2,opt,name=field10809" json:"field10809,omitempty"`
-	Field10810    *bool    `protobuf:"varint,3,opt,name=field10810" json:"field10810,omitempty"`
-	Field10811    *float32 `protobuf:"fixed32,4,opt,name=field10811" json:"field10811,omitempty"`
+
+	Field10808 *string  `protobuf:"bytes,1,opt,name=field10808" json:"field10808,omitempty"`
+	Field10809 *int64   `protobuf:"varint,2,opt,name=field10809" json:"field10809,omitempty"`
+	Field10810 *bool    `protobuf:"varint,3,opt,name=field10810" json:"field10810,omitempty"`
+	Field10811 *float32 `protobuf:"fixed32,4,opt,name=field10811" json:"field10811,omitempty"`
 }
 
 func (x *Message10800) Reset() {
@@ -152,10 +153,11 @@ type Message10748 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10750    *string `protobuf:"bytes,1,opt,name=field10750" json:"field10750,omitempty"`
-	Field10751    *int32  `protobuf:"varint,2,opt,name=field10751" json:"field10751,omitempty"`
-	Field10752    *int32  `protobuf:"varint,3,opt,name=field10752" json:"field10752,omitempty"`
-	Field10753    *int32  `protobuf:"varint,4,opt,name=field10753" json:"field10753,omitempty"`
+
+	Field10750 *string `protobuf:"bytes,1,opt,name=field10750" json:"field10750,omitempty"`
+	Field10751 *int32  `protobuf:"varint,2,opt,name=field10751" json:"field10751,omitempty"`
+	Field10752 *int32  `protobuf:"varint,3,opt,name=field10752" json:"field10752,omitempty"`
+	Field10753 *int32  `protobuf:"varint,4,opt,name=field10753" json:"field10753,omitempty"`
 }
 
 func (x *Message10748) Reset() {
@@ -217,8 +219,9 @@ type Message7966 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7969     *string `protobuf:"bytes,1,opt,name=field7969" json:"field7969,omitempty"`
-	Field7970     *bool   `protobuf:"varint,2,opt,name=field7970" json:"field7970,omitempty"`
+
+	Field7969 *string `protobuf:"bytes,1,opt,name=field7969" json:"field7969,omitempty"`
+	Field7970 *bool   `protobuf:"varint,2,opt,name=field7970" json:"field7970,omitempty"`
 }
 
 func (x *Message7966) Reset() {
@@ -266,12 +269,13 @@ type Message708 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field823      *Message741 `protobuf:"bytes,1,opt,name=field823" json:"field823,omitempty"`
-	Field824      []string    `protobuf:"bytes,6,rep,name=field824" json:"field824,omitempty"`
-	Field825      *string     `protobuf:"bytes,2,opt,name=field825" json:"field825,omitempty"`
-	Field826      *string     `protobuf:"bytes,3,opt,name=field826" json:"field826,omitempty"`
-	Field827      []string    `protobuf:"bytes,4,rep,name=field827" json:"field827,omitempty"`
-	Field828      []string    `protobuf:"bytes,5,rep,name=field828" json:"field828,omitempty"`
+
+	Field823 *Message741 `protobuf:"bytes,1,opt,name=field823" json:"field823,omitempty"`
+	Field824 []string    `protobuf:"bytes,6,rep,name=field824" json:"field824,omitempty"`
+	Field825 *string     `protobuf:"bytes,2,opt,name=field825" json:"field825,omitempty"`
+	Field826 *string     `protobuf:"bytes,3,opt,name=field826" json:"field826,omitempty"`
+	Field827 []string    `protobuf:"bytes,4,rep,name=field827" json:"field827,omitempty"`
+	Field828 []string    `protobuf:"bytes,5,rep,name=field828" json:"field828,omitempty"`
 }
 
 func (x *Message708) Reset() {
@@ -380,8 +384,9 @@ type Message11011 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11752    []byte `protobuf:"bytes,1,req,name=field11752" json:"field11752,omitempty"`
-	Field11753    []byte `protobuf:"bytes,2,req,name=field11753" json:"field11753,omitempty"`
+
+	Field11752 []byte `protobuf:"bytes,1,req,name=field11752" json:"field11752,omitempty"`
+	Field11753 []byte `protobuf:"bytes,2,req,name=field11753" json:"field11753,omitempty"`
 }
 
 func (x *Message11011) Reset() {
@@ -462,7 +467,8 @@ type Message741 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field936      []string `protobuf:"bytes,1,rep,name=field936" json:"field936,omitempty"`
+
+	Field936 []string `protobuf:"bytes,1,rep,name=field936" json:"field936,omitempty"`
 }
 
 func (x *Message741) Reset() {

internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go

@@ -22,22 +22,23 @@ type GoogleMessage4 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37503    *int32              `protobuf:"varint,1,opt,name=field37503" json:"field37503,omitempty"`
-	Field37504    *UnusedEmptyMessage `protobuf:"bytes,2,opt,name=field37504" json:"field37504,omitempty"`
-	Field37505    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field37505" json:"field37505,omitempty"`
-	Field37506    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37506" json:"field37506,omitempty"`
-	Field37507    *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field37507" json:"field37507,omitempty"`
-	Field37508    *Message37489       `protobuf:"bytes,6,opt,name=field37508" json:"field37508,omitempty"`
-	Field37509    *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37509" json:"field37509,omitempty"`
-	Field37510    *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field37510" json:"field37510,omitempty"`
-	Field37511    *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field37511" json:"field37511,omitempty"`
-	Field37512    *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field37512" json:"field37512,omitempty"`
-	Field37513    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37513" json:"field37513,omitempty"`
-	Field37514    *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field37514" json:"field37514,omitempty"`
-	Field37515    *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field37515" json:"field37515,omitempty"`
-	Field37516    *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field37516" json:"field37516,omitempty"`
-	Field37517    *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field37517" json:"field37517,omitempty"`
-	Field37518    *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field37518" json:"field37518,omitempty"`
+
+	Field37503 *int32              `protobuf:"varint,1,opt,name=field37503" json:"field37503,omitempty"`
+	Field37504 *UnusedEmptyMessage `protobuf:"bytes,2,opt,name=field37504" json:"field37504,omitempty"`
+	Field37505 *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field37505" json:"field37505,omitempty"`
+	Field37506 *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37506" json:"field37506,omitempty"`
+	Field37507 *UnusedEmptyMessage `protobuf:"bytes,5,opt,name=field37507" json:"field37507,omitempty"`
+	Field37508 *Message37489       `protobuf:"bytes,6,opt,name=field37508" json:"field37508,omitempty"`
+	Field37509 *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37509" json:"field37509,omitempty"`
+	Field37510 *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field37510" json:"field37510,omitempty"`
+	Field37511 *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field37511" json:"field37511,omitempty"`
+	Field37512 *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field37512" json:"field37512,omitempty"`
+	Field37513 *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37513" json:"field37513,omitempty"`
+	Field37514 *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field37514" json:"field37514,omitempty"`
+	Field37515 *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field37515" json:"field37515,omitempty"`
+	Field37516 *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field37516" json:"field37516,omitempty"`
+	Field37517 *UnusedEmptyMessage `protobuf:"bytes,15,opt,name=field37517" json:"field37517,omitempty"`
+	Field37518 *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field37518" json:"field37518,omitempty"`
 }
 
 func (x *GoogleMessage4) Reset() {
@@ -183,27 +184,28 @@ type Message37489 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37534    *Message2517  `protobuf:"bytes,3,opt,name=field37534" json:"field37534,omitempty"`
-	Field37535    *Message7330  `protobuf:"bytes,4,opt,name=field37535" json:"field37535,omitempty"`
-	Field37536    *Message8815  `protobuf:"bytes,6,opt,name=field37536" json:"field37536,omitempty"`
-	Field37537    *Message8817  `protobuf:"bytes,7,opt,name=field37537" json:"field37537,omitempty"`
-	Field37538    *Message8835  `protobuf:"bytes,8,opt,name=field37538" json:"field37538,omitempty"`
-	Field37539    *Message8848  `protobuf:"bytes,9,opt,name=field37539" json:"field37539,omitempty"`
-	Field37540    *Message8856  `protobuf:"bytes,11,opt,name=field37540" json:"field37540,omitempty"`
-	Field37541    *Message12717 `protobuf:"bytes,15,opt,name=field37541" json:"field37541,omitempty"`
-	Field37542    *Message12748 `protobuf:"bytes,20,opt,name=field37542" json:"field37542,omitempty"`
-	Field37543    *Message7319  `protobuf:"bytes,22,opt,name=field37543" json:"field37543,omitempty"`
-	Field37544    *Message12908 `protobuf:"bytes,24,opt,name=field37544" json:"field37544,omitempty"`
-	Field37545    *Message12910 `protobuf:"bytes,25,opt,name=field37545" json:"field37545,omitempty"`
-	Field37546    *Message12960 `protobuf:"bytes,30,opt,name=field37546" json:"field37546,omitempty"`
-	Field37547    *Message176   `protobuf:"bytes,33,opt,name=field37547" json:"field37547,omitempty"`
-	Field37548    *Message13000 `protobuf:"bytes,34,opt,name=field37548" json:"field37548,omitempty"`
-	Field37549    *Message13035 `protobuf:"bytes,35,opt,name=field37549" json:"field37549,omitempty"`
-	Field37550    *Message37331 `protobuf:"bytes,36,opt,name=field37550" json:"field37550,omitempty"`
-	Field37551    *Message37329 `protobuf:"bytes,37,opt,name=field37551" json:"field37551,omitempty"`
-	Field37552    *Message37327 `protobuf:"bytes,38,opt,name=field37552" json:"field37552,omitempty"`
-	Field37553    *Message37333 `protobuf:"bytes,39,opt,name=field37553" json:"field37553,omitempty"`
-	Field37554    *Message37335 `protobuf:"bytes,40,opt,name=field37554" json:"field37554,omitempty"`
+
+	Field37534 *Message2517  `protobuf:"bytes,3,opt,name=field37534" json:"field37534,omitempty"`
+	Field37535 *Message7330  `protobuf:"bytes,4,opt,name=field37535" json:"field37535,omitempty"`
+	Field37536 *Message8815  `protobuf:"bytes,6,opt,name=field37536" json:"field37536,omitempty"`
+	Field37537 *Message8817  `protobuf:"bytes,7,opt,name=field37537" json:"field37537,omitempty"`
+	Field37538 *Message8835  `protobuf:"bytes,8,opt,name=field37538" json:"field37538,omitempty"`
+	Field37539 *Message8848  `protobuf:"bytes,9,opt,name=field37539" json:"field37539,omitempty"`
+	Field37540 *Message8856  `protobuf:"bytes,11,opt,name=field37540" json:"field37540,omitempty"`
+	Field37541 *Message12717 `protobuf:"bytes,15,opt,name=field37541" json:"field37541,omitempty"`
+	Field37542 *Message12748 `protobuf:"bytes,20,opt,name=field37542" json:"field37542,omitempty"`
+	Field37543 *Message7319  `protobuf:"bytes,22,opt,name=field37543" json:"field37543,omitempty"`
+	Field37544 *Message12908 `protobuf:"bytes,24,opt,name=field37544" json:"field37544,omitempty"`
+	Field37545 *Message12910 `protobuf:"bytes,25,opt,name=field37545" json:"field37545,omitempty"`
+	Field37546 *Message12960 `protobuf:"bytes,30,opt,name=field37546" json:"field37546,omitempty"`
+	Field37547 *Message176   `protobuf:"bytes,33,opt,name=field37547" json:"field37547,omitempty"`
+	Field37548 *Message13000 `protobuf:"bytes,34,opt,name=field37548" json:"field37548,omitempty"`
+	Field37549 *Message13035 `protobuf:"bytes,35,opt,name=field37549" json:"field37549,omitempty"`
+	Field37550 *Message37331 `protobuf:"bytes,36,opt,name=field37550" json:"field37550,omitempty"`
+	Field37551 *Message37329 `protobuf:"bytes,37,opt,name=field37551" json:"field37551,omitempty"`
+	Field37552 *Message37327 `protobuf:"bytes,38,opt,name=field37552" json:"field37552,omitempty"`
+	Field37553 *Message37333 `protobuf:"bytes,39,opt,name=field37553" json:"field37553,omitempty"`
+	Field37554 *Message37335 `protobuf:"bytes,40,opt,name=field37554" json:"field37554,omitempty"`
 }
 
 func (x *Message37489) Reset() {
@@ -384,8 +386,9 @@ type Message7319 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7321     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7321" json:"field7321,omitempty"`
-	Field7322     *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field7322" json:"field7322,omitempty"`
+
+	Field7321 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7321" json:"field7321,omitempty"`
+	Field7322 *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field7322" json:"field7322,omitempty"`
 }
 
 func (x *Message7319) Reset() {
@@ -433,15 +436,16 @@ type Message12717 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12719    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12719" json:"field12719,omitempty"`
-	Field12720    *string             `protobuf:"bytes,2,opt,name=field12720" json:"field12720,omitempty"`
-	Field12721    *uint32             `protobuf:"varint,3,opt,name=field12721" json:"field12721,omitempty"`
-	Field12722    *Message11976       `protobuf:"bytes,4,opt,name=field12722" json:"field12722,omitempty"`
-	Field12723    []*Message11948     `protobuf:"bytes,5,rep,name=field12723" json:"field12723,omitempty"`
-	Field12724    *Message11947       `protobuf:"bytes,6,opt,name=field12724" json:"field12724,omitempty"`
-	Field12725    *Message12687       `protobuf:"bytes,7,opt,name=field12725" json:"field12725,omitempty"`
-	Field12726    []*Message11948     `protobuf:"bytes,8,rep,name=field12726" json:"field12726,omitempty"`
-	Field12727    *int64              `protobuf:"varint,9,opt,name=field12727" json:"field12727,omitempty"`
+
+	Field12719 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12719" json:"field12719,omitempty"`
+	Field12720 *string             `protobuf:"bytes,2,opt,name=field12720" json:"field12720,omitempty"`
+	Field12721 *uint32             `protobuf:"varint,3,opt,name=field12721" json:"field12721,omitempty"`
+	Field12722 *Message11976       `protobuf:"bytes,4,opt,name=field12722" json:"field12722,omitempty"`
+	Field12723 []*Message11948     `protobuf:"bytes,5,rep,name=field12723" json:"field12723,omitempty"`
+	Field12724 *Message11947       `protobuf:"bytes,6,opt,name=field12724" json:"field12724,omitempty"`
+	Field12725 *Message12687       `protobuf:"bytes,7,opt,name=field12725" json:"field12725,omitempty"`
+	Field12726 []*Message11948     `protobuf:"bytes,8,rep,name=field12726" json:"field12726,omitempty"`
+	Field12727 *int64              `protobuf:"varint,9,opt,name=field12727" json:"field12727,omitempty"`
 }
 
 func (x *Message12717) Reset() {
@@ -538,10 +542,11 @@ type Message37331 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37367    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37367" json:"field37367,omitempty"`
-	Field37368    *Message37326       `protobuf:"bytes,1,req,name=field37368" json:"field37368,omitempty"`
-	Field37369    *int64              `protobuf:"varint,2,req,name=field37369" json:"field37369,omitempty"`
-	Field37370    []byte              `protobuf:"bytes,3,req,name=field37370" json:"field37370,omitempty"`
+
+	Field37367 *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37367" json:"field37367,omitempty"`
+	Field37368 *Message37326       `protobuf:"bytes,1,req,name=field37368" json:"field37368,omitempty"`
+	Field37369 *int64              `protobuf:"varint,2,req,name=field37369" json:"field37369,omitempty"`
+	Field37370 []byte              `protobuf:"bytes,3,req,name=field37370" json:"field37370,omitempty"`
 }
 
 func (x *Message37331) Reset() {
@@ -603,9 +608,10 @@ type Message8815 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8819     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8819" json:"field8819,omitempty"`
-	Field8820     []*Message8768      `protobuf:"bytes,2,rep,name=field8820" json:"field8820,omitempty"`
-	Field8821     *bool               `protobuf:"varint,3,opt,name=field8821" json:"field8821,omitempty"`
+
+	Field8819 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8819" json:"field8819,omitempty"`
+	Field8820 []*Message8768      `protobuf:"bytes,2,rep,name=field8820" json:"field8820,omitempty"`
+	Field8821 *bool               `protobuf:"varint,3,opt,name=field8821" json:"field8821,omitempty"`
 }
 
 func (x *Message8815) Reset() {
@@ -660,12 +666,13 @@ type Message7330 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7332     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7332" json:"field7332,omitempty"`
-	Field7333     *Message3069        `protobuf:"bytes,2,opt,name=field7333" json:"field7333,omitempty"`
-	Field7334     *Message7320        `protobuf:"bytes,3,opt,name=field7334" json:"field7334,omitempty"`
-	Field7335     *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field7335" json:"field7335,omitempty"`
-	Field7336     *bool               `protobuf:"varint,5,opt,name=field7336" json:"field7336,omitempty"`
-	Field7337     *int64              `protobuf:"varint,6,opt,name=field7337" json:"field7337,omitempty"`
+
+	Field7332 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7332" json:"field7332,omitempty"`
+	Field7333 *Message3069        `protobuf:"bytes,2,opt,name=field7333" json:"field7333,omitempty"`
+	Field7334 *Message7320        `protobuf:"bytes,3,opt,name=field7334" json:"field7334,omitempty"`
+	Field7335 *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field7335" json:"field7335,omitempty"`
+	Field7336 *bool               `protobuf:"varint,5,opt,name=field7336" json:"field7336,omitempty"`
+	Field7337 *int64              `protobuf:"varint,6,opt,name=field7337" json:"field7337,omitempty"`
 }
 
 func (x *Message7330) Reset() {
@@ -741,8 +748,9 @@ type Message12960 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12962    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12962" json:"field12962,omitempty"`
-	Field12963    *Message12948       `protobuf:"bytes,2,opt,name=field12963" json:"field12963,omitempty"`
+
+	Field12962 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12962" json:"field12962,omitempty"`
+	Field12963 *Message12948       `protobuf:"bytes,2,opt,name=field12963" json:"field12963,omitempty"`
 }
 
 func (x *Message12960) Reset() {
@@ -790,65 +798,66 @@ type Message176 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field408      *string                  `protobuf:"bytes,1,req,name=field408" json:"field408,omitempty"`
-	Field409      *int32                   `protobuf:"varint,4,opt,name=field409" json:"field409,omitempty"`
-	Field410      *string                  `protobuf:"bytes,50,opt,name=field410" json:"field410,omitempty"`
-	Field411      *int32                   `protobuf:"varint,2,opt,name=field411" json:"field411,omitempty"`
-	Field412      *uint64                  `protobuf:"varint,47,opt,name=field412" json:"field412,omitempty"`
-	Field413      *string                  `protobuf:"bytes,56,opt,name=field413" json:"field413,omitempty"`
-	Field414      *int32                   `protobuf:"varint,24,opt,name=field414" json:"field414,omitempty"`
-	Field415      *string                  `protobuf:"bytes,21,opt,name=field415" json:"field415,omitempty"`
-	Field416      []byte                   `protobuf:"bytes,3,opt,name=field416" json:"field416,omitempty"`
-	Field417      *string                  `protobuf:"bytes,57,opt,name=field417" json:"field417,omitempty"`
-	Field418      *int32                   `protobuf:"varint,51,opt,name=field418" json:"field418,omitempty"`
-	Field419      *float32                 `protobuf:"fixed32,7,opt,name=field419" json:"field419,omitempty"`
-	Field420      *bool                    `protobuf:"varint,5,opt,name=field420" json:"field420,omitempty"`
-	Field421      *bool                    `protobuf:"varint,28,opt,name=field421" json:"field421,omitempty"`
-	Field422      *int32                   `protobuf:"varint,6,opt,name=field422" json:"field422,omitempty"`
-	Field423      []int32                  `protobuf:"varint,40,rep,name=field423" json:"field423,omitempty"`
-	Field424      *UnusedEmptyMessage      `protobuf:"bytes,41,opt,name=field424" json:"field424,omitempty"`
-	Field425      *bool                    `protobuf:"varint,25,opt,name=field425" json:"field425,omitempty"`
-	Field426      *uint64                  `protobuf:"varint,26,opt,name=field426" json:"field426,omitempty"`
-	Field427      *int32                   `protobuf:"varint,38,opt,name=field427" json:"field427,omitempty"`
-	Field428      []byte                   `protobuf:"bytes,15,opt,name=field428" json:"field428,omitempty"`
-	Field429      []byte                   `protobuf:"bytes,55,opt,name=field429" json:"field429,omitempty"`
-	Field430      []byte                   `protobuf:"bytes,16,opt,name=field430" json:"field430,omitempty"`
-	Field431      []byte                   `protobuf:"bytes,23,opt,name=field431" json:"field431,omitempty"`
-	Field432      *bool                    `protobuf:"varint,33,opt,name=field432" json:"field432,omitempty"`
-	Field433      []byte                   `protobuf:"bytes,31,opt,name=field433" json:"field433,omitempty"`
-	Field434      []byte                   `protobuf:"bytes,32,opt,name=field434" json:"field434,omitempty"`
-	Field435      *int32                   `protobuf:"varint,36,opt,name=field435" json:"field435,omitempty"`
-	Field436      *uint64                  `protobuf:"varint,17,opt,name=field436" json:"field436,omitempty"`
-	Field437      *int32                   `protobuf:"varint,45,opt,name=field437" json:"field437,omitempty"`
-	Field438      *uint64                  `protobuf:"varint,18,opt,name=field438" json:"field438,omitempty"`
-	Field439      *string                  `protobuf:"bytes,46,opt,name=field439" json:"field439,omitempty"`
-	Field440      *UnusedEmptyMessage      `protobuf:"bytes,64,opt,name=field440" json:"field440,omitempty"`
-	Field441      *int32                   `protobuf:"varint,39,opt,name=field441" json:"field441,omitempty"`
-	Field442      *uint64                  `protobuf:"varint,48,opt,name=field442" json:"field442,omitempty"`
-	Field443      []byte                   `protobuf:"bytes,19,opt,name=field443" json:"field443,omitempty"`
-	Field444      []byte                   `protobuf:"bytes,42,opt,name=field444" json:"field444,omitempty"`
-	Field445      []byte                   `protobuf:"bytes,43,opt,name=field445" json:"field445,omitempty"`
-	Field446      *string                  `protobuf:"bytes,44,opt,name=field446" json:"field446,omitempty"`
-	Field447      *string                  `protobuf:"bytes,49,opt,name=field447" json:"field447,omitempty"`
-	Field448      *int64                   `protobuf:"varint,20,opt,name=field448" json:"field448,omitempty"`
-	Field449      *bool                    `protobuf:"varint,53,opt,name=field449" json:"field449,omitempty"`
-	Field450      *UnusedEmptyMessage      `protobuf:"bytes,54,opt,name=field450" json:"field450,omitempty"`
-	Field451      []*UnusedEmptyMessage    `protobuf:"bytes,22,rep,name=field451" json:"field451,omitempty"`
-	Field452      *UnusedEnum              `protobuf:"varint,27,opt,name=field452,enum=benchmarks.google_message4.UnusedEnum" json:"field452,omitempty"`
-	Field453      *int32                   `protobuf:"varint,29,opt,name=field453" json:"field453,omitempty"`
-	Field454      *int32                   `protobuf:"varint,30,opt,name=field454" json:"field454,omitempty"`
-	Field455      *UnusedEnum              `protobuf:"varint,37,opt,name=field455,enum=benchmarks.google_message4.UnusedEnum" json:"field455,omitempty"`
-	Field456      *UnusedEnum              `protobuf:"varint,34,opt,name=field456,enum=benchmarks.google_message4.UnusedEnum" json:"field456,omitempty"`
-	Field457      *int32                   `protobuf:"varint,35,opt,name=field457" json:"field457,omitempty"`
-	Message178    []*Message176_Message178 `protobuf:"group,101,rep,name=Message178,json=message178" json:"message178,omitempty"`
-	Field459      *bool                    `protobuf:"varint,52,opt,name=field459" json:"field459,omitempty"`
-	Field460      *uint64                  `protobuf:"varint,58,opt,name=field460" json:"field460,omitempty"`
-	Field461      *uint64                  `protobuf:"varint,59,opt,name=field461" json:"field461,omitempty"`
-	Field462      *UnusedEmptyMessage      `protobuf:"bytes,60,opt,name=field462" json:"field462,omitempty"`
-	Field463      *UnusedEmptyMessage      `protobuf:"bytes,61,opt,name=field463" json:"field463,omitempty"`
-	Field464      *UnusedEnum              `protobuf:"varint,62,opt,name=field464,enum=benchmarks.google_message4.UnusedEnum" json:"field464,omitempty"`
-	Field465      []string                 `protobuf:"bytes,63,rep,name=field465" json:"field465,omitempty"`
-	Field466      *UnusedEmptyMessage      `protobuf:"bytes,65,opt,name=field466" json:"field466,omitempty"`
+
+	Field408   *string                  `protobuf:"bytes,1,req,name=field408" json:"field408,omitempty"`
+	Field409   *int32                   `protobuf:"varint,4,opt,name=field409" json:"field409,omitempty"`
+	Field410   *string                  `protobuf:"bytes,50,opt,name=field410" json:"field410,omitempty"`
+	Field411   *int32                   `protobuf:"varint,2,opt,name=field411" json:"field411,omitempty"`
+	Field412   *uint64                  `protobuf:"varint,47,opt,name=field412" json:"field412,omitempty"`
+	Field413   *string                  `protobuf:"bytes,56,opt,name=field413" json:"field413,omitempty"`
+	Field414   *int32                   `protobuf:"varint,24,opt,name=field414" json:"field414,omitempty"`
+	Field415   *string                  `protobuf:"bytes,21,opt,name=field415" json:"field415,omitempty"`
+	Field416   []byte                   `protobuf:"bytes,3,opt,name=field416" json:"field416,omitempty"`
+	Field417   *string                  `protobuf:"bytes,57,opt,name=field417" json:"field417,omitempty"`
+	Field418   *int32                   `protobuf:"varint,51,opt,name=field418" json:"field418,omitempty"`
+	Field419   *float32                 `protobuf:"fixed32,7,opt,name=field419" json:"field419,omitempty"`
+	Field420   *bool                    `protobuf:"varint,5,opt,name=field420" json:"field420,omitempty"`
+	Field421   *bool                    `protobuf:"varint,28,opt,name=field421" json:"field421,omitempty"`
+	Field422   *int32                   `protobuf:"varint,6,opt,name=field422" json:"field422,omitempty"`
+	Field423   []int32                  `protobuf:"varint,40,rep,name=field423" json:"field423,omitempty"`
+	Field424   *UnusedEmptyMessage      `protobuf:"bytes,41,opt,name=field424" json:"field424,omitempty"`
+	Field425   *bool                    `protobuf:"varint,25,opt,name=field425" json:"field425,omitempty"`
+	Field426   *uint64                  `protobuf:"varint,26,opt,name=field426" json:"field426,omitempty"`
+	Field427   *int32                   `protobuf:"varint,38,opt,name=field427" json:"field427,omitempty"`
+	Field428   []byte                   `protobuf:"bytes,15,opt,name=field428" json:"field428,omitempty"`
+	Field429   []byte                   `protobuf:"bytes,55,opt,name=field429" json:"field429,omitempty"`
+	Field430   []byte                   `protobuf:"bytes,16,opt,name=field430" json:"field430,omitempty"`
+	Field431   []byte                   `protobuf:"bytes,23,opt,name=field431" json:"field431,omitempty"`
+	Field432   *bool                    `protobuf:"varint,33,opt,name=field432" json:"field432,omitempty"`
+	Field433   []byte                   `protobuf:"bytes,31,opt,name=field433" json:"field433,omitempty"`
+	Field434   []byte                   `protobuf:"bytes,32,opt,name=field434" json:"field434,omitempty"`
+	Field435   *int32                   `protobuf:"varint,36,opt,name=field435" json:"field435,omitempty"`
+	Field436   *uint64                  `protobuf:"varint,17,opt,name=field436" json:"field436,omitempty"`
+	Field437   *int32                   `protobuf:"varint,45,opt,name=field437" json:"field437,omitempty"`
+	Field438   *uint64                  `protobuf:"varint,18,opt,name=field438" json:"field438,omitempty"`
+	Field439   *string                  `protobuf:"bytes,46,opt,name=field439" json:"field439,omitempty"`
+	Field440   *UnusedEmptyMessage      `protobuf:"bytes,64,opt,name=field440" json:"field440,omitempty"`
+	Field441   *int32                   `protobuf:"varint,39,opt,name=field441" json:"field441,omitempty"`
+	Field442   *uint64                  `protobuf:"varint,48,opt,name=field442" json:"field442,omitempty"`
+	Field443   []byte                   `protobuf:"bytes,19,opt,name=field443" json:"field443,omitempty"`
+	Field444   []byte                   `protobuf:"bytes,42,opt,name=field444" json:"field444,omitempty"`
+	Field445   []byte                   `protobuf:"bytes,43,opt,name=field445" json:"field445,omitempty"`
+	Field446   *string                  `protobuf:"bytes,44,opt,name=field446" json:"field446,omitempty"`
+	Field447   *string                  `protobuf:"bytes,49,opt,name=field447" json:"field447,omitempty"`
+	Field448   *int64                   `protobuf:"varint,20,opt,name=field448" json:"field448,omitempty"`
+	Field449   *bool                    `protobuf:"varint,53,opt,name=field449" json:"field449,omitempty"`
+	Field450   *UnusedEmptyMessage      `protobuf:"bytes,54,opt,name=field450" json:"field450,omitempty"`
+	Field451   []*UnusedEmptyMessage    `protobuf:"bytes,22,rep,name=field451" json:"field451,omitempty"`
+	Field452   *UnusedEnum              `protobuf:"varint,27,opt,name=field452,enum=benchmarks.google_message4.UnusedEnum" json:"field452,omitempty"`
+	Field453   *int32                   `protobuf:"varint,29,opt,name=field453" json:"field453,omitempty"`
+	Field454   *int32                   `protobuf:"varint,30,opt,name=field454" json:"field454,omitempty"`
+	Field455   *UnusedEnum              `protobuf:"varint,37,opt,name=field455,enum=benchmarks.google_message4.UnusedEnum" json:"field455,omitempty"`
+	Field456   *UnusedEnum              `protobuf:"varint,34,opt,name=field456,enum=benchmarks.google_message4.UnusedEnum" json:"field456,omitempty"`
+	Field457   *int32                   `protobuf:"varint,35,opt,name=field457" json:"field457,omitempty"`
+	Message178 []*Message176_Message178 `protobuf:"group,101,rep,name=Message178,json=message178" json:"message178,omitempty"`
+	Field459   *bool                    `protobuf:"varint,52,opt,name=field459" json:"field459,omitempty"`
+	Field460   *uint64                  `protobuf:"varint,58,opt,name=field460" json:"field460,omitempty"`
+	Field461   *uint64                  `protobuf:"varint,59,opt,name=field461" json:"field461,omitempty"`
+	Field462   *UnusedEmptyMessage      `protobuf:"bytes,60,opt,name=field462" json:"field462,omitempty"`
+	Field463   *UnusedEmptyMessage      `protobuf:"bytes,61,opt,name=field463" json:"field463,omitempty"`
+	Field464   *UnusedEnum              `protobuf:"varint,62,opt,name=field464,enum=benchmarks.google_message4.UnusedEnum" json:"field464,omitempty"`
+	Field465   []string                 `protobuf:"bytes,63,rep,name=field465" json:"field465,omitempty"`
+	Field466   *UnusedEmptyMessage      `protobuf:"bytes,65,opt,name=field466" json:"field466,omitempty"`
 }
 
 func (x *Message176) Reset() {
@@ -1295,9 +1304,10 @@ type Message8817 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8825     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8825" json:"field8825,omitempty"`
-	Field8826     []*Message8768      `protobuf:"bytes,2,rep,name=field8826" json:"field8826,omitempty"`
-	Field8827     *string             `protobuf:"bytes,3,opt,name=field8827" json:"field8827,omitempty"`
+
+	Field8825 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8825" json:"field8825,omitempty"`
+	Field8826 []*Message8768      `protobuf:"bytes,2,rep,name=field8826" json:"field8826,omitempty"`
+	Field8827 *string             `protobuf:"bytes,3,opt,name=field8827" json:"field8827,omitempty"`
 }
 
 func (x *Message8817) Reset() {
@@ -1352,9 +1362,10 @@ type Message8835 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8837     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8837" json:"field8837,omitempty"`
-	Field8838     []string            `protobuf:"bytes,2,rep,name=field8838" json:"field8838,omitempty"`
-	Field8839     *UnusedEnum         `protobuf:"varint,3,opt,name=field8839,enum=benchmarks.google_message4.UnusedEnum" json:"field8839,omitempty"`
+
+	Field8837 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8837" json:"field8837,omitempty"`
+	Field8838 []string            `protobuf:"bytes,2,rep,name=field8838" json:"field8838,omitempty"`
+	Field8839 *UnusedEnum         `protobuf:"varint,3,opt,name=field8839,enum=benchmarks.google_message4.UnusedEnum" json:"field8839,omitempty"`
 }
 
 func (x *Message8835) Reset() {
@@ -1409,9 +1420,10 @@ type Message37333 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37372    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field37372" json:"field37372,omitempty"`
-	Field37373    *Message37326       `protobuf:"bytes,1,req,name=field37373" json:"field37373,omitempty"`
-	Field37374    *uint64             `protobuf:"varint,2,opt,name=field37374" json:"field37374,omitempty"`
+
+	Field37372 *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field37372" json:"field37372,omitempty"`
+	Field37373 *Message37326       `protobuf:"bytes,1,req,name=field37373" json:"field37373,omitempty"`
+	Field37374 *uint64             `protobuf:"varint,2,opt,name=field37374" json:"field37374,omitempty"`
 }
 
 func (x *Message37333) Reset() {
@@ -1466,8 +1478,9 @@ type Message13000 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13015    *int64          `protobuf:"varint,1,opt,name=field13015" json:"field13015,omitempty"`
-	Field13016    []*Message12979 `protobuf:"bytes,2,rep,name=field13016" json:"field13016,omitempty"`
+
+	Field13015 *int64          `protobuf:"varint,1,opt,name=field13015" json:"field13015,omitempty"`
+	Field13016 []*Message12979 `protobuf:"bytes,2,rep,name=field13016" json:"field13016,omitempty"`
 }
 
 func (x *Message13000) Reset() {
@@ -1515,10 +1528,11 @@ type Message37335 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37376    *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37376" json:"field37376,omitempty"`
-	Field37377    *Message37326       `protobuf:"bytes,1,req,name=field37377" json:"field37377,omitempty"`
-	Field37378    *Message37173       `protobuf:"bytes,2,req,name=field37378" json:"field37378,omitempty"`
-	Field37379    *uint64             `protobuf:"varint,3,opt,name=field37379" json:"field37379,omitempty"`
+
+	Field37376 *UnusedEmptyMessage `protobuf:"bytes,4,opt,name=field37376" json:"field37376,omitempty"`
+	Field37377 *Message37326       `protobuf:"bytes,1,req,name=field37377" json:"field37377,omitempty"`
+	Field37378 *Message37173       `protobuf:"bytes,2,req,name=field37378" json:"field37378,omitempty"`
+	Field37379 *uint64             `protobuf:"varint,3,opt,name=field37379" json:"field37379,omitempty"`
 }
 
 func (x *Message37335) Reset() {
@@ -1580,9 +1594,10 @@ type Message8848 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8850     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8850" json:"field8850,omitempty"`
-	Field8851     *string             `protobuf:"bytes,2,opt,name=field8851" json:"field8851,omitempty"`
-	Field8852     []byte              `protobuf:"bytes,3,opt,name=field8852" json:"field8852,omitempty"`
+
+	Field8850 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8850" json:"field8850,omitempty"`
+	Field8851 *string             `protobuf:"bytes,2,opt,name=field8851" json:"field8851,omitempty"`
+	Field8852 []byte              `protobuf:"bytes,3,opt,name=field8852" json:"field8852,omitempty"`
 }
 
 func (x *Message8848) Reset() {
@@ -1637,8 +1652,9 @@ type Message13035 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field13058    *int64  `protobuf:"varint,1,opt,name=field13058" json:"field13058,omitempty"`
-	Field13059    []int64 `protobuf:"varint,2,rep,name=field13059" json:"field13059,omitempty"`
+
+	Field13058 *int64  `protobuf:"varint,1,opt,name=field13058" json:"field13058,omitempty"`
+	Field13059 []int64 `protobuf:"varint,2,rep,name=field13059" json:"field13059,omitempty"`
 }
 
 func (x *Message13035) Reset() {
@@ -1686,8 +1702,9 @@ type Message8856 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8858     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8858" json:"field8858,omitempty"`
-	Field8859     *string             `protobuf:"bytes,2,opt,name=field8859" json:"field8859,omitempty"`
+
+	Field8858 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field8858" json:"field8858,omitempty"`
+	Field8859 *string             `protobuf:"bytes,2,opt,name=field8859" json:"field8859,omitempty"`
 }
 
 func (x *Message8856) Reset() {
@@ -1735,12 +1752,13 @@ type Message12908 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12912    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12912" json:"field12912,omitempty"`
-	Field12913    *string             `protobuf:"bytes,2,opt,name=field12913" json:"field12913,omitempty"`
-	Field12914    *Message12799       `protobuf:"bytes,3,opt,name=field12914" json:"field12914,omitempty"`
-	Field12915    *int64              `protobuf:"varint,4,opt,name=field12915" json:"field12915,omitempty"`
-	Field12916    *Message3804        `protobuf:"bytes,5,opt,name=field12916" json:"field12916,omitempty"`
-	Field12917    *Message12870       `protobuf:"bytes,6,opt,name=field12917" json:"field12917,omitempty"`
+
+	Field12912 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12912" json:"field12912,omitempty"`
+	Field12913 *string             `protobuf:"bytes,2,opt,name=field12913" json:"field12913,omitempty"`
+	Field12914 *Message12799       `protobuf:"bytes,3,opt,name=field12914" json:"field12914,omitempty"`
+	Field12915 *int64              `protobuf:"varint,4,opt,name=field12915" json:"field12915,omitempty"`
+	Field12916 *Message3804        `protobuf:"bytes,5,opt,name=field12916" json:"field12916,omitempty"`
+	Field12917 *Message12870       `protobuf:"bytes,6,opt,name=field12917" json:"field12917,omitempty"`
 }
 
 func (x *Message12908) Reset() {
@@ -1816,9 +1834,10 @@ type Message12910 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12920    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12920" json:"field12920,omitempty"`
-	Field12921    *Message12818       `protobuf:"bytes,2,opt,name=field12921" json:"field12921,omitempty"`
-	Field12922    []*Message12903     `protobuf:"bytes,3,rep,name=field12922" json:"field12922,omitempty"`
+
+	Field12920 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12920" json:"field12920,omitempty"`
+	Field12921 *Message12818       `protobuf:"bytes,2,opt,name=field12921" json:"field12921,omitempty"`
+	Field12922 []*Message12903     `protobuf:"bytes,3,rep,name=field12922" json:"field12922,omitempty"`
 }
 
 func (x *Message12910) Reset() {
@@ -1873,17 +1892,18 @@ type Message37327 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37347    *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37347" json:"field37347,omitempty"`
-	Field37348    *Message37326       `protobuf:"bytes,1,req,name=field37348" json:"field37348,omitempty"`
-	Field37349    *bool               `protobuf:"varint,2,opt,name=field37349" json:"field37349,omitempty"`
-	Field37350    *bool               `protobuf:"varint,3,opt,name=field37350" json:"field37350,omitempty"`
-	Field37351    *bool               `protobuf:"varint,4,opt,name=field37351" json:"field37351,omitempty"`
-	Field37352    *bool               `protobuf:"varint,5,opt,name=field37352" json:"field37352,omitempty"`
-	Field37353    *bool               `protobuf:"varint,6,opt,name=field37353" json:"field37353,omitempty"`
-	Field37354    *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37354" json:"field37354,omitempty"`
-	Field37355    *uint64             `protobuf:"varint,8,opt,name=field37355" json:"field37355,omitempty"`
-	Field37356    *bool               `protobuf:"varint,9,opt,name=field37356" json:"field37356,omitempty"`
-	Field37357    *bool               `protobuf:"varint,10,opt,name=field37357" json:"field37357,omitempty"`
+
+	Field37347 *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field37347" json:"field37347,omitempty"`
+	Field37348 *Message37326       `protobuf:"bytes,1,req,name=field37348" json:"field37348,omitempty"`
+	Field37349 *bool               `protobuf:"varint,2,opt,name=field37349" json:"field37349,omitempty"`
+	Field37350 *bool               `protobuf:"varint,3,opt,name=field37350" json:"field37350,omitempty"`
+	Field37351 *bool               `protobuf:"varint,4,opt,name=field37351" json:"field37351,omitempty"`
+	Field37352 *bool               `protobuf:"varint,5,opt,name=field37352" json:"field37352,omitempty"`
+	Field37353 *bool               `protobuf:"varint,6,opt,name=field37353" json:"field37353,omitempty"`
+	Field37354 *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field37354" json:"field37354,omitempty"`
+	Field37355 *uint64             `protobuf:"varint,8,opt,name=field37355" json:"field37355,omitempty"`
+	Field37356 *bool               `protobuf:"varint,9,opt,name=field37356" json:"field37356,omitempty"`
+	Field37357 *bool               `protobuf:"varint,10,opt,name=field37357" json:"field37357,omitempty"`
 }
 
 func (x *Message37327) Reset() {
@@ -1994,11 +2014,12 @@ type Message37329 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37359    *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field37359" json:"field37359,omitempty"`
-	Field37360    *Message37326       `protobuf:"bytes,1,req,name=field37360" json:"field37360,omitempty"`
-	Field37361    *int64              `protobuf:"varint,2,req,name=field37361" json:"field37361,omitempty"`
-	Field37362    *int64              `protobuf:"varint,3,req,name=field37362" json:"field37362,omitempty"`
-	Field37363    *bool               `protobuf:"varint,4,opt,name=field37363" json:"field37363,omitempty"`
+
+	Field37359 *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field37359" json:"field37359,omitempty"`
+	Field37360 *Message37326       `protobuf:"bytes,1,req,name=field37360" json:"field37360,omitempty"`
+	Field37361 *int64              `protobuf:"varint,2,req,name=field37361" json:"field37361,omitempty"`
+	Field37362 *int64              `protobuf:"varint,3,req,name=field37362" json:"field37362,omitempty"`
+	Field37363 *bool               `protobuf:"varint,4,opt,name=field37363" json:"field37363,omitempty"`
 }
 
 func (x *Message37329) Reset() {
@@ -2067,11 +2088,12 @@ type Message2517 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field2519     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field2519" json:"field2519,omitempty"`
-	Field2520     *Message2356        `protobuf:"bytes,2,opt,name=field2520" json:"field2520,omitempty"`
-	Field2521     *Message0           `protobuf:"bytes,3,opt,name=field2521" json:"field2521,omitempty"`
-	Field2522     *Message2463        `protobuf:"bytes,4,opt,name=field2522" json:"field2522,omitempty"`
-	Field2523     []*Message971       `protobuf:"bytes,5,rep,name=field2523" json:"field2523,omitempty"`
+
+	Field2519 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field2519" json:"field2519,omitempty"`
+	Field2520 *Message2356        `protobuf:"bytes,2,opt,name=field2520" json:"field2520,omitempty"`
+	Field2521 *Message0           `protobuf:"bytes,3,opt,name=field2521" json:"field2521,omitempty"`
+	Field2522 *Message2463        `protobuf:"bytes,4,opt,name=field2522" json:"field2522,omitempty"`
+	Field2523 []*Message971       `protobuf:"bytes,5,rep,name=field2523" json:"field2523,omitempty"`
 }
 
 func (x *Message2517) Reset() {
@@ -2140,10 +2162,11 @@ type Message12748 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12754    *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12754" json:"field12754,omitempty"`
-	Field12755    *string             `protobuf:"bytes,2,opt,name=field12755" json:"field12755,omitempty"`
-	Field12756    *string             `protobuf:"bytes,3,opt,name=field12756" json:"field12756,omitempty"`
-	Field12757    *Enum12735          `protobuf:"varint,4,opt,name=field12757,enum=benchmarks.google_message4.Enum12735" json:"field12757,omitempty"`
+
+	Field12754 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field12754" json:"field12754,omitempty"`
+	Field12755 *string             `protobuf:"bytes,2,opt,name=field12755" json:"field12755,omitempty"`
+	Field12756 *string             `protobuf:"bytes,3,opt,name=field12756" json:"field12756,omitempty"`
+	Field12757 *Enum12735          `protobuf:"varint,4,opt,name=field12757,enum=benchmarks.google_message4.Enum12735" json:"field12757,omitempty"`
 }
 
 func (x *Message12748) Reset() {
@@ -2205,7 +2228,8 @@ type Message12687 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12701    []*Message12686 `protobuf:"bytes,1,rep,name=field12701" json:"field12701,omitempty"`
+
+	Field12701 []*Message12686 `protobuf:"bytes,1,rep,name=field12701" json:"field12701,omitempty"`
 }
 
 func (x *Message12687) Reset() {
@@ -2246,9 +2270,10 @@ type Message11948 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11954    *string         `protobuf:"bytes,1,opt,name=field11954" json:"field11954,omitempty"`
-	Field11955    []*Message11949 `protobuf:"bytes,2,rep,name=field11955" json:"field11955,omitempty"`
-	Field11956    *bool           `protobuf:"varint,3,opt,name=field11956" json:"field11956,omitempty"`
+
+	Field11954 *string         `protobuf:"bytes,1,opt,name=field11954" json:"field11954,omitempty"`
+	Field11955 []*Message11949 `protobuf:"bytes,2,rep,name=field11955" json:"field11955,omitempty"`
+	Field11956 *bool           `protobuf:"varint,3,opt,name=field11956" json:"field11956,omitempty"`
 }
 
 func (x *Message11948) Reset() {
@@ -2303,7 +2328,8 @@ type Message11976 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12002    []*Message11975 `protobuf:"bytes,1,rep,name=field12002" json:"field12002,omitempty"`
+
+	Field12002 []*Message11975 `protobuf:"bytes,1,rep,name=field12002" json:"field12002,omitempty"`
 }
 
 func (x *Message11976) Reset() {
@@ -2344,8 +2370,9 @@ type Message7320 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7323     *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7323" json:"field7323,omitempty"`
-	Field7324     *Message7287        `protobuf:"bytes,8,opt,name=field7324" json:"field7324,omitempty"`
+
+	Field7323 *UnusedEmptyMessage `protobuf:"bytes,1,opt,name=field7323" json:"field7323,omitempty"`
+	Field7324 *Message7287        `protobuf:"bytes,8,opt,name=field7324" json:"field7324,omitempty"`
 }
 
 func (x *Message7320) Reset() {
@@ -2394,9 +2421,10 @@ type Message3069 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field3374       *Message3061               `protobuf:"bytes,1,opt,name=field3374" json:"field3374,omitempty"`
-	Field3375       []byte                     `protobuf:"bytes,2,opt,name=field3375" json:"field3375,omitempty"`
-	Message3070     []*Message3069_Message3070 `protobuf:"group,3,rep,name=Message3070,json=message3070" json:"message3070,omitempty"`
+
+	Field3374   *Message3061               `protobuf:"bytes,1,opt,name=field3374" json:"field3374,omitempty"`
+	Field3375   []byte                     `protobuf:"bytes,2,opt,name=field3375" json:"field3375,omitempty"`
+	Message3070 []*Message3069_Message3070 `protobuf:"group,3,rep,name=Message3070,json=message3070" json:"message3070,omitempty"`
 }
 
 func (x *Message3069) Reset() {
@@ -2460,7 +2488,8 @@ type Message12948 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12958    []*Message12949 `protobuf:"bytes,1,rep,name=field12958" json:"field12958,omitempty"`
+
+	Field12958 []*Message12949 `protobuf:"bytes,1,rep,name=field12958" json:"field12958,omitempty"`
 }
 
 func (x *Message12948) Reset() {
@@ -2501,13 +2530,14 @@ type Message8768 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8782     *string             `protobuf:"bytes,1,opt,name=field8782" json:"field8782,omitempty"`
-	Field8783     *Message8572        `protobuf:"bytes,2,opt,name=field8783" json:"field8783,omitempty"`
-	Field8784     *bool               `protobuf:"varint,3,opt,name=field8784" json:"field8784,omitempty"`
-	Field8785     []*Message8774      `protobuf:"bytes,4,rep,name=field8785" json:"field8785,omitempty"`
-	Field8786     *int64              `protobuf:"varint,5,opt,name=field8786" json:"field8786,omitempty"`
-	Field8787     *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field8787" json:"field8787,omitempty"`
-	Field8788     *string             `protobuf:"bytes,7,opt,name=field8788" json:"field8788,omitempty"`
+
+	Field8782 *string             `protobuf:"bytes,1,opt,name=field8782" json:"field8782,omitempty"`
+	Field8783 *Message8572        `protobuf:"bytes,2,opt,name=field8783" json:"field8783,omitempty"`
+	Field8784 *bool               `protobuf:"varint,3,opt,name=field8784" json:"field8784,omitempty"`
+	Field8785 []*Message8774      `protobuf:"bytes,4,rep,name=field8785" json:"field8785,omitempty"`
+	Field8786 *int64              `protobuf:"varint,5,opt,name=field8786" json:"field8786,omitempty"`
+	Field8787 *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field8787" json:"field8787,omitempty"`
+	Field8788 *string             `protobuf:"bytes,7,opt,name=field8788" json:"field8788,omitempty"`
 }
 
 func (x *Message8768) Reset() {
@@ -2590,13 +2620,14 @@ type Message12979 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12981    []byte              `protobuf:"bytes,1,req,name=field12981" json:"field12981,omitempty"`
-	Field12982    []string            `protobuf:"bytes,2,rep,name=field12982" json:"field12982,omitempty"`
-	Field12983    *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field12983" json:"field12983,omitempty"`
-	Field12984    *int64              `protobuf:"varint,4,opt,name=field12984" json:"field12984,omitempty"`
-	Field12985    *string             `protobuf:"bytes,5,opt,name=field12985" json:"field12985,omitempty"`
-	Field12986    *int32              `protobuf:"varint,6,opt,name=field12986" json:"field12986,omitempty"`
-	Field12987    *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field12987" json:"field12987,omitempty"`
+
+	Field12981 []byte              `protobuf:"bytes,1,req,name=field12981" json:"field12981,omitempty"`
+	Field12982 []string            `protobuf:"bytes,2,rep,name=field12982" json:"field12982,omitempty"`
+	Field12983 *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field12983" json:"field12983,omitempty"`
+	Field12984 *int64              `protobuf:"varint,4,opt,name=field12984" json:"field12984,omitempty"`
+	Field12985 *string             `protobuf:"bytes,5,opt,name=field12985" json:"field12985,omitempty"`
+	Field12986 *int32              `protobuf:"varint,6,opt,name=field12986" json:"field12986,omitempty"`
+	Field12987 *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field12987" json:"field12987,omitempty"`
 }
 
 func (x *Message12979) Reset() {
@@ -2679,31 +2710,32 @@ type Message37173 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37252    *string             `protobuf:"bytes,1,opt,name=field37252" json:"field37252,omitempty"`
-	Field37253    *int64              `protobuf:"varint,2,opt,name=field37253" json:"field37253,omitempty"`
-	Field37254    *UnusedEnum         `protobuf:"varint,4,opt,name=field37254,enum=benchmarks.google_message4.UnusedEnum" json:"field37254,omitempty"`
-	Field37255    *bool               `protobuf:"varint,5,opt,name=field37255" json:"field37255,omitempty"`
-	Field37256    *bool               `protobuf:"varint,6,opt,name=field37256" json:"field37256,omitempty"`
-	Field37257    *bool               `protobuf:"varint,7,opt,name=field37257" json:"field37257,omitempty"`
-	Field37258    *string             `protobuf:"bytes,8,opt,name=field37258" json:"field37258,omitempty"`
-	Field37259    *string             `protobuf:"bytes,9,opt,name=field37259" json:"field37259,omitempty"`
-	Field37260    *uint32             `protobuf:"varint,10,opt,name=field37260" json:"field37260,omitempty"`
-	Field37261    *uint32             `protobuf:"fixed32,11,opt,name=field37261" json:"field37261,omitempty"`
-	Field37262    *string             `protobuf:"bytes,12,opt,name=field37262" json:"field37262,omitempty"`
-	Field37263    *string             `protobuf:"bytes,13,opt,name=field37263" json:"field37263,omitempty"`
-	Field37264    *string             `protobuf:"bytes,14,opt,name=field37264" json:"field37264,omitempty"`
-	Field37265    *int32              `protobuf:"varint,15,opt,name=field37265" json:"field37265,omitempty"`
-	Field37266    *int64              `protobuf:"varint,16,opt,name=field37266" json:"field37266,omitempty"`
-	Field37267    *int64              `protobuf:"varint,17,opt,name=field37267" json:"field37267,omitempty"`
-	Field37268    *int32              `protobuf:"varint,18,opt,name=field37268" json:"field37268,omitempty"`
-	Field37269    *int32              `protobuf:"varint,19,opt,name=field37269" json:"field37269,omitempty"`
-	Field37270    *UnusedEmptyMessage `protobuf:"bytes,20,opt,name=field37270" json:"field37270,omitempty"`
-	Field37271    *UnusedEmptyMessage `protobuf:"bytes,21,opt,name=field37271" json:"field37271,omitempty"`
-	Field37272    *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field37272" json:"field37272,omitempty"`
-	Field37273    *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field37273" json:"field37273,omitempty"`
-	Field37274    *UnusedEmptyMessage `protobuf:"bytes,24,opt,name=field37274" json:"field37274,omitempty"`
-	Field37275    *string             `protobuf:"bytes,25,opt,name=field37275" json:"field37275,omitempty"`
-	Field37276    *bool               `protobuf:"varint,26,opt,name=field37276" json:"field37276,omitempty"`
+
+	Field37252 *string             `protobuf:"bytes,1,opt,name=field37252" json:"field37252,omitempty"`
+	Field37253 *int64              `protobuf:"varint,2,opt,name=field37253" json:"field37253,omitempty"`
+	Field37254 *UnusedEnum         `protobuf:"varint,4,opt,name=field37254,enum=benchmarks.google_message4.UnusedEnum" json:"field37254,omitempty"`
+	Field37255 *bool               `protobuf:"varint,5,opt,name=field37255" json:"field37255,omitempty"`
+	Field37256 *bool               `protobuf:"varint,6,opt,name=field37256" json:"field37256,omitempty"`
+	Field37257 *bool               `protobuf:"varint,7,opt,name=field37257" json:"field37257,omitempty"`
+	Field37258 *string             `protobuf:"bytes,8,opt,name=field37258" json:"field37258,omitempty"`
+	Field37259 *string             `protobuf:"bytes,9,opt,name=field37259" json:"field37259,omitempty"`
+	Field37260 *uint32             `protobuf:"varint,10,opt,name=field37260" json:"field37260,omitempty"`
+	Field37261 *uint32             `protobuf:"fixed32,11,opt,name=field37261" json:"field37261,omitempty"`
+	Field37262 *string             `protobuf:"bytes,12,opt,name=field37262" json:"field37262,omitempty"`
+	Field37263 *string             `protobuf:"bytes,13,opt,name=field37263" json:"field37263,omitempty"`
+	Field37264 *string             `protobuf:"bytes,14,opt,name=field37264" json:"field37264,omitempty"`
+	Field37265 *int32              `protobuf:"varint,15,opt,name=field37265" json:"field37265,omitempty"`
+	Field37266 *int64              `protobuf:"varint,16,opt,name=field37266" json:"field37266,omitempty"`
+	Field37267 *int64              `protobuf:"varint,17,opt,name=field37267" json:"field37267,omitempty"`
+	Field37268 *int32              `protobuf:"varint,18,opt,name=field37268" json:"field37268,omitempty"`
+	Field37269 *int32              `protobuf:"varint,19,opt,name=field37269" json:"field37269,omitempty"`
+	Field37270 *UnusedEmptyMessage `protobuf:"bytes,20,opt,name=field37270" json:"field37270,omitempty"`
+	Field37271 *UnusedEmptyMessage `protobuf:"bytes,21,opt,name=field37271" json:"field37271,omitempty"`
+	Field37272 *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field37272" json:"field37272,omitempty"`
+	Field37273 *UnusedEmptyMessage `protobuf:"bytes,23,opt,name=field37273" json:"field37273,omitempty"`
+	Field37274 *UnusedEmptyMessage `protobuf:"bytes,24,opt,name=field37274" json:"field37274,omitempty"`
+	Field37275 *string             `protobuf:"bytes,25,opt,name=field37275" json:"field37275,omitempty"`
+	Field37276 *bool               `protobuf:"varint,26,opt,name=field37276" json:"field37276,omitempty"`
 }
 
 func (x *Message37173) Reset() {
@@ -2912,14 +2944,15 @@ type Message12799 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12809    *string         `protobuf:"bytes,1,req,name=field12809" json:"field12809,omitempty"`
-	Field12810    []uint64        `protobuf:"fixed64,2,rep,name=field12810" json:"field12810,omitempty"`
-	Field12811    []*Message12776 `protobuf:"bytes,8,rep,name=field12811" json:"field12811,omitempty"`
-	Field12812    []int32         `protobuf:"varint,4,rep,name=field12812" json:"field12812,omitempty"`
-	Field12813    []*Message12798 `protobuf:"bytes,5,rep,name=field12813" json:"field12813,omitempty"`
-	Field12814    *int32          `protobuf:"varint,3,req,name=field12814" json:"field12814,omitempty"`
-	Field12815    *int32          `protobuf:"varint,6,opt,name=field12815" json:"field12815,omitempty"`
-	Field12816    *Message12797   `protobuf:"bytes,7,opt,name=field12816" json:"field12816,omitempty"`
+
+	Field12809 *string         `protobuf:"bytes,1,req,name=field12809" json:"field12809,omitempty"`
+	Field12810 []uint64        `protobuf:"fixed64,2,rep,name=field12810" json:"field12810,omitempty"`
+	Field12811 []*Message12776 `protobuf:"bytes,8,rep,name=field12811" json:"field12811,omitempty"`
+	Field12812 []int32         `protobuf:"varint,4,rep,name=field12812" json:"field12812,omitempty"`
+	Field12813 []*Message12798 `protobuf:"bytes,5,rep,name=field12813" json:"field12813,omitempty"`
+	Field12814 *int32          `protobuf:"varint,3,req,name=field12814" json:"field12814,omitempty"`
+	Field12815 *int32          `protobuf:"varint,6,opt,name=field12815" json:"field12815,omitempty"`
+	Field12816 *Message12797   `protobuf:"bytes,7,opt,name=field12816" json:"field12816,omitempty"`
 }
 
 func (x *Message12799) Reset() {
@@ -3009,26 +3042,27 @@ type Message12870 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12879    *int32          `protobuf:"varint,1,req,name=field12879" json:"field12879,omitempty"`
-	Field12880    *int32          `protobuf:"varint,7,opt,name=field12880" json:"field12880,omitempty"`
-	Field12881    *int32          `protobuf:"varint,2,req,name=field12881" json:"field12881,omitempty"`
-	Field12882    *uint64         `protobuf:"varint,3,opt,name=field12882" json:"field12882,omitempty"`
-	Field12883    *string         `protobuf:"bytes,2001,opt,name=field12883" json:"field12883,omitempty"`
-	Field12884    *uint64         `protobuf:"fixed64,4,opt,name=field12884" json:"field12884,omitempty"`
-	Field12885    []uint64        `protobuf:"fixed64,14,rep,name=field12885" json:"field12885,omitempty"`
-	Field12886    *int32          `protobuf:"varint,9,opt,name=field12886" json:"field12886,omitempty"`
-	Field12887    *int64          `protobuf:"varint,18,opt,name=field12887" json:"field12887,omitempty"`
-	Field12888    []*Message12870 `protobuf:"bytes,8,rep,name=field12888" json:"field12888,omitempty"`
-	Field12889    *int32          `protobuf:"varint,5,opt,name=field12889" json:"field12889,omitempty"`
-	Field12890    *uint64         `protobuf:"varint,6,opt,name=field12890" json:"field12890,omitempty"`
-	Field12891    *int32          `protobuf:"varint,10,opt,name=field12891" json:"field12891,omitempty"`
-	Field12892    *int32          `protobuf:"varint,11,opt,name=field12892" json:"field12892,omitempty"`
-	Field12893    *float64        `protobuf:"fixed64,12,opt,name=field12893" json:"field12893,omitempty"`
-	Field12894    *Message12825   `protobuf:"bytes,13,opt,name=field12894" json:"field12894,omitempty"`
-	Field12895    *float64        `protobuf:"fixed64,15,opt,name=field12895" json:"field12895,omitempty"`
-	Field12896    *string         `protobuf:"bytes,16,opt,name=field12896" json:"field12896,omitempty"`
-	Field12897    *Enum12871      `protobuf:"varint,17,opt,name=field12897,enum=benchmarks.google_message4.Enum12871" json:"field12897,omitempty"`
-	Field12898    *int32          `protobuf:"varint,19,opt,name=field12898" json:"field12898,omitempty"`
+
+	Field12879 *int32          `protobuf:"varint,1,req,name=field12879" json:"field12879,omitempty"`
+	Field12880 *int32          `protobuf:"varint,7,opt,name=field12880" json:"field12880,omitempty"`
+	Field12881 *int32          `protobuf:"varint,2,req,name=field12881" json:"field12881,omitempty"`
+	Field12882 *uint64         `protobuf:"varint,3,opt,name=field12882" json:"field12882,omitempty"`
+	Field12883 *string         `protobuf:"bytes,2001,opt,name=field12883" json:"field12883,omitempty"`
+	Field12884 *uint64         `protobuf:"fixed64,4,opt,name=field12884" json:"field12884,omitempty"`
+	Field12885 []uint64        `protobuf:"fixed64,14,rep,name=field12885" json:"field12885,omitempty"`
+	Field12886 *int32          `protobuf:"varint,9,opt,name=field12886" json:"field12886,omitempty"`
+	Field12887 *int64          `protobuf:"varint,18,opt,name=field12887" json:"field12887,omitempty"`
+	Field12888 []*Message12870 `protobuf:"bytes,8,rep,name=field12888" json:"field12888,omitempty"`
+	Field12889 *int32          `protobuf:"varint,5,opt,name=field12889" json:"field12889,omitempty"`
+	Field12890 *uint64         `protobuf:"varint,6,opt,name=field12890" json:"field12890,omitempty"`
+	Field12891 *int32          `protobuf:"varint,10,opt,name=field12891" json:"field12891,omitempty"`
+	Field12892 *int32          `protobuf:"varint,11,opt,name=field12892" json:"field12892,omitempty"`
+	Field12893 *float64        `protobuf:"fixed64,12,opt,name=field12893" json:"field12893,omitempty"`
+	Field12894 *Message12825   `protobuf:"bytes,13,opt,name=field12894" json:"field12894,omitempty"`
+	Field12895 *float64        `protobuf:"fixed64,15,opt,name=field12895" json:"field12895,omitempty"`
+	Field12896 *string         `protobuf:"bytes,16,opt,name=field12896" json:"field12896,omitempty"`
+	Field12897 *Enum12871      `protobuf:"varint,17,opt,name=field12897,enum=benchmarks.google_message4.Enum12871" json:"field12897,omitempty"`
+	Field12898 *int32          `protobuf:"varint,19,opt,name=field12898" json:"field12898,omitempty"`
 }
 
 func (x *Message12870) Reset() {
@@ -3202,13 +3236,14 @@ type Message3804 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3818     *int64     `protobuf:"varint,1,req,name=field3818" json:"field3818,omitempty"`
-	Field3819     *bool      `protobuf:"varint,2,req,name=field3819" json:"field3819,omitempty"`
-	Field3820     []Enum3805 `protobuf:"varint,4,rep,name=field3820,enum=benchmarks.google_message4.Enum3805" json:"field3820,omitempty"`
-	Field3821     *int32     `protobuf:"varint,5,opt,name=field3821" json:"field3821,omitempty"`
-	Field3822     *bool      `protobuf:"varint,6,opt,name=field3822" json:"field3822,omitempty"`
-	Field3823     *int64     `protobuf:"varint,7,opt,name=field3823" json:"field3823,omitempty"`
-	Field3824     *Enum3783  `protobuf:"varint,8,opt,name=field3824,enum=benchmarks.google_message4.Enum3783" json:"field3824,omitempty"`
+
+	Field3818 *int64     `protobuf:"varint,1,req,name=field3818" json:"field3818,omitempty"`
+	Field3819 *bool      `protobuf:"varint,2,req,name=field3819" json:"field3819,omitempty"`
+	Field3820 []Enum3805 `protobuf:"varint,4,rep,name=field3820,enum=benchmarks.google_message4.Enum3805" json:"field3820,omitempty"`
+	Field3821 *int32     `protobuf:"varint,5,opt,name=field3821" json:"field3821,omitempty"`
+	Field3822 *bool      `protobuf:"varint,6,opt,name=field3822" json:"field3822,omitempty"`
+	Field3823 *int64     `protobuf:"varint,7,opt,name=field3823" json:"field3823,omitempty"`
+	Field3824 *Enum3783  `protobuf:"varint,8,opt,name=field3824,enum=benchmarks.google_message4.Enum3783" json:"field3824,omitempty"`
 }
 
 func (x *Message3804) Reset() {
@@ -3291,9 +3326,10 @@ type Message12903 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12905    *string        `protobuf:"bytes,1,opt,name=field12905" json:"field12905,omitempty"`
-	Field12906    *Message8587   `protobuf:"bytes,2,opt,name=field12906" json:"field12906,omitempty"`
-	Field12907    []*Message8590 `protobuf:"bytes,3,rep,name=field12907" json:"field12907,omitempty"`
+
+	Field12905 *string        `protobuf:"bytes,1,opt,name=field12905" json:"field12905,omitempty"`
+	Field12906 *Message8587   `protobuf:"bytes,2,opt,name=field12906" json:"field12906,omitempty"`
+	Field12907 []*Message8590 `protobuf:"bytes,3,rep,name=field12907" json:"field12907,omitempty"`
 }
 
 func (x *Message12903) Reset() {
@@ -3348,8 +3384,9 @@ type Message37326 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field37345    *string `protobuf:"bytes,1,req,name=field37345" json:"field37345,omitempty"`
-	Field37346    *string `protobuf:"bytes,2,opt,name=field37346" json:"field37346,omitempty"`
+
+	Field37345 *string `protobuf:"bytes,1,req,name=field37345" json:"field37345,omitempty"`
+	Field37346 *string `protobuf:"bytes,2,opt,name=field37346" json:"field37346,omitempty"`
 }
 
 func (x *Message37326) Reset() {
@@ -3397,37 +3434,38 @@ type Message2356 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field2368     *Message1374               `protobuf:"bytes,121,opt,name=field2368" json:"field2368,omitempty"`
-	Field2369     *uint64                    `protobuf:"varint,1,opt,name=field2369" json:"field2369,omitempty"`
-	Field2370     *int32                     `protobuf:"varint,2,opt,name=field2370" json:"field2370,omitempty"`
-	Field2371     *int32                     `protobuf:"varint,17,opt,name=field2371" json:"field2371,omitempty"`
-	Field2372     *string                    `protobuf:"bytes,3,req,name=field2372" json:"field2372,omitempty"`
-	Field2373     *int32                     `protobuf:"varint,7,opt,name=field2373" json:"field2373,omitempty"`
-	Field2374     []byte                     `protobuf:"bytes,8,opt,name=field2374" json:"field2374,omitempty"`
-	Field2375     *string                    `protobuf:"bytes,4,opt,name=field2375" json:"field2375,omitempty"`
-	Field2376     *string                    `protobuf:"bytes,101,opt,name=field2376" json:"field2376,omitempty"`
-	Field2377     *int32                     `protobuf:"varint,102,opt,name=field2377" json:"field2377,omitempty"`
-	Field2378     *int32                     `protobuf:"varint,103,opt,name=field2378" json:"field2378,omitempty"`
-	Field2379     *int32                     `protobuf:"varint,104,opt,name=field2379" json:"field2379,omitempty"`
-	Field2380     *int32                     `protobuf:"varint,113,opt,name=field2380" json:"field2380,omitempty"`
-	Field2381     *int32                     `protobuf:"varint,114,opt,name=field2381" json:"field2381,omitempty"`
-	Field2382     *int32                     `protobuf:"varint,115,opt,name=field2382" json:"field2382,omitempty"`
-	Field2383     *int32                     `protobuf:"varint,117,opt,name=field2383" json:"field2383,omitempty"`
-	Field2384     *int32                     `protobuf:"varint,118,opt,name=field2384" json:"field2384,omitempty"`
-	Field2385     *int32                     `protobuf:"varint,119,opt,name=field2385" json:"field2385,omitempty"`
-	Field2386     *int32                     `protobuf:"varint,105,opt,name=field2386" json:"field2386,omitempty"`
-	Field2387     []byte                     `protobuf:"bytes,5,opt,name=field2387" json:"field2387,omitempty"`
-	Message2357   *Message2356_Message2357   `protobuf:"group,6,opt,name=Message2357,json=message2357" json:"message2357,omitempty"`
-	Field2389     *string                    `protobuf:"bytes,120,opt,name=field2389" json:"field2389,omitempty"`
-	Message2358   *Message2356_Message2358   `protobuf:"group,107,opt,name=Message2358,json=message2358" json:"message2358,omitempty"`
-	Message2359   []*Message2356_Message2359 `protobuf:"group,40,rep,name=Message2359,json=message2359" json:"message2359,omitempty"`
-	Field2392     *int32                     `protobuf:"varint,50,opt,name=field2392" json:"field2392,omitempty"`
-	Field2393     *UnusedEmptyMessage        `protobuf:"bytes,60,opt,name=field2393" json:"field2393,omitempty"`
-	Field2394     *UnusedEmptyMessage        `protobuf:"bytes,70,opt,name=field2394" json:"field2394,omitempty"`
-	Field2395     *UnusedEmptyMessage        `protobuf:"bytes,80,opt,name=field2395" json:"field2395,omitempty"`
-	Field2396     *UnusedEmptyMessage        `protobuf:"bytes,90,opt,name=field2396" json:"field2396,omitempty"`
-	Field2397     *string                    `protobuf:"bytes,100,opt,name=field2397" json:"field2397,omitempty"`
-	Field2398     *string                    `protobuf:"bytes,123,opt,name=field2398" json:"field2398,omitempty"`
+
+	Field2368   *Message1374               `protobuf:"bytes,121,opt,name=field2368" json:"field2368,omitempty"`
+	Field2369   *uint64                    `protobuf:"varint,1,opt,name=field2369" json:"field2369,omitempty"`
+	Field2370   *int32                     `protobuf:"varint,2,opt,name=field2370" json:"field2370,omitempty"`
+	Field2371   *int32                     `protobuf:"varint,17,opt,name=field2371" json:"field2371,omitempty"`
+	Field2372   *string                    `protobuf:"bytes,3,req,name=field2372" json:"field2372,omitempty"`
+	Field2373   *int32                     `protobuf:"varint,7,opt,name=field2373" json:"field2373,omitempty"`
+	Field2374   []byte                     `protobuf:"bytes,8,opt,name=field2374" json:"field2374,omitempty"`
+	Field2375   *string                    `protobuf:"bytes,4,opt,name=field2375" json:"field2375,omitempty"`
+	Field2376   *string                    `protobuf:"bytes,101,opt,name=field2376" json:"field2376,omitempty"`
+	Field2377   *int32                     `protobuf:"varint,102,opt,name=field2377" json:"field2377,omitempty"`
+	Field2378   *int32                     `protobuf:"varint,103,opt,name=field2378" json:"field2378,omitempty"`
+	Field2379   *int32                     `protobuf:"varint,104,opt,name=field2379" json:"field2379,omitempty"`
+	Field2380   *int32                     `protobuf:"varint,113,opt,name=field2380" json:"field2380,omitempty"`
+	Field2381   *int32                     `protobuf:"varint,114,opt,name=field2381" json:"field2381,omitempty"`
+	Field2382   *int32                     `protobuf:"varint,115,opt,name=field2382" json:"field2382,omitempty"`
+	Field2383   *int32                     `protobuf:"varint,117,opt,name=field2383" json:"field2383,omitempty"`
+	Field2384   *int32                     `protobuf:"varint,118,opt,name=field2384" json:"field2384,omitempty"`
+	Field2385   *int32                     `protobuf:"varint,119,opt,name=field2385" json:"field2385,omitempty"`
+	Field2386   *int32                     `protobuf:"varint,105,opt,name=field2386" json:"field2386,omitempty"`
+	Field2387   []byte                     `protobuf:"bytes,5,opt,name=field2387" json:"field2387,omitempty"`
+	Message2357 *Message2356_Message2357   `protobuf:"group,6,opt,name=Message2357,json=message2357" json:"message2357,omitempty"`
+	Field2389   *string                    `protobuf:"bytes,120,opt,name=field2389" json:"field2389,omitempty"`
+	Message2358 *Message2356_Message2358   `protobuf:"group,107,opt,name=Message2358,json=message2358" json:"message2358,omitempty"`
+	Message2359 []*Message2356_Message2359 `protobuf:"group,40,rep,name=Message2359,json=message2359" json:"message2359,omitempty"`
+	Field2392   *int32                     `protobuf:"varint,50,opt,name=field2392" json:"field2392,omitempty"`
+	Field2393   *UnusedEmptyMessage        `protobuf:"bytes,60,opt,name=field2393" json:"field2393,omitempty"`
+	Field2394   *UnusedEmptyMessage        `protobuf:"bytes,70,opt,name=field2394" json:"field2394,omitempty"`
+	Field2395   *UnusedEmptyMessage        `protobuf:"bytes,80,opt,name=field2395" json:"field2395,omitempty"`
+	Field2396   *UnusedEmptyMessage        `protobuf:"bytes,90,opt,name=field2396" json:"field2396,omitempty"`
+	Field2397   *string                    `protobuf:"bytes,100,opt,name=field2397" json:"field2397,omitempty"`
+	Field2398   *string                    `protobuf:"bytes,123,opt,name=field2398" json:"field2398,omitempty"`
 }
 
 func (x *Message2356) Reset() {
@@ -3721,9 +3759,10 @@ type Message971 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field972      *string `protobuf:"bytes,1,opt,name=field972" json:"field972,omitempty"`
-	Field973      *int32  `protobuf:"varint,2,opt,name=field973" json:"field973,omitempty"`
-	Field974      *bool   `protobuf:"varint,3,opt,name=field974" json:"field974,omitempty"`
+
+	Field972 *string `protobuf:"bytes,1,opt,name=field972" json:"field972,omitempty"`
+	Field973 *int32  `protobuf:"varint,2,opt,name=field973" json:"field973,omitempty"`
+	Field974 *bool   `protobuf:"varint,3,opt,name=field974" json:"field974,omitempty"`
 }
 
 func (x *Message971) Reset() {
@@ -3811,8 +3850,9 @@ type Message3069_Message3070 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3378     *Enum3071 `protobuf:"varint,4,req,name=field3378,enum=benchmarks.google_message4.Enum3071" json:"field3378,omitempty"`
-	Field3379     []byte    `protobuf:"bytes,5,req,name=field3379" json:"field3379,omitempty"`
+
+	Field3378 *Enum3071 `protobuf:"varint,4,req,name=field3378,enum=benchmarks.google_message4.Enum3071" json:"field3378,omitempty"`
+	Field3379 []byte    `protobuf:"bytes,5,req,name=field3379" json:"field3379,omitempty"`
 }
 
 func (x *Message3069_Message3070) Reset() {
@@ -3860,18 +3900,19 @@ type Message2356_Message2357 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field2399     *int64 `protobuf:"varint,9,opt,name=field2399" json:"field2399,omitempty"`
-	Field2400     *int32 `protobuf:"varint,10,opt,name=field2400" json:"field2400,omitempty"`
-	Field2401     *int32 `protobuf:"varint,11,opt,name=field2401" json:"field2401,omitempty"`
-	Field2402     *int32 `protobuf:"varint,12,opt,name=field2402" json:"field2402,omitempty"`
-	Field2403     *int32 `protobuf:"varint,13,opt,name=field2403" json:"field2403,omitempty"`
-	Field2404     *int32 `protobuf:"varint,116,opt,name=field2404" json:"field2404,omitempty"`
-	Field2405     *int32 `protobuf:"varint,106,opt,name=field2405" json:"field2405,omitempty"`
-	Field2406     []byte `protobuf:"bytes,14,req,name=field2406" json:"field2406,omitempty"`
-	Field2407     *int32 `protobuf:"varint,45,opt,name=field2407" json:"field2407,omitempty"`
-	Field2408     *int32 `protobuf:"varint,112,opt,name=field2408" json:"field2408,omitempty"`
-	Field2409     *bool  `protobuf:"varint,122,opt,name=field2409" json:"field2409,omitempty"`
-	Field2410     []byte `protobuf:"bytes,124,opt,name=field2410" json:"field2410,omitempty"`
+
+	Field2399 *int64 `protobuf:"varint,9,opt,name=field2399" json:"field2399,omitempty"`
+	Field2400 *int32 `protobuf:"varint,10,opt,name=field2400" json:"field2400,omitempty"`
+	Field2401 *int32 `protobuf:"varint,11,opt,name=field2401" json:"field2401,omitempty"`
+	Field2402 *int32 `protobuf:"varint,12,opt,name=field2402" json:"field2402,omitempty"`
+	Field2403 *int32 `protobuf:"varint,13,opt,name=field2403" json:"field2403,omitempty"`
+	Field2404 *int32 `protobuf:"varint,116,opt,name=field2404" json:"field2404,omitempty"`
+	Field2405 *int32 `protobuf:"varint,106,opt,name=field2405" json:"field2405,omitempty"`
+	Field2406 []byte `protobuf:"bytes,14,req,name=field2406" json:"field2406,omitempty"`
+	Field2407 *int32 `protobuf:"varint,45,opt,name=field2407" json:"field2407,omitempty"`
+	Field2408 *int32 `protobuf:"varint,112,opt,name=field2408" json:"field2408,omitempty"`
+	Field2409 *bool  `protobuf:"varint,122,opt,name=field2409" json:"field2409,omitempty"`
+	Field2410 []byte `protobuf:"bytes,124,opt,name=field2410" json:"field2410,omitempty"`
 }
 
 func (x *Message2356_Message2357) Reset() {

internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go

@@ -22,7 +22,8 @@ type Message2463 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field2498     []*Message2462 `protobuf:"bytes,1,rep,name=field2498" json:"field2498,omitempty"`
+
+	Field2498 []*Message2462 `protobuf:"bytes,1,rep,name=field2498" json:"field2498,omitempty"`
 }
 
 func (x *Message2463) Reset() {
@@ -63,8 +64,9 @@ type Message12686 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12699    *string       `protobuf:"bytes,1,opt,name=field12699" json:"field12699,omitempty"`
-	Field12700    *Message12685 `protobuf:"bytes,2,opt,name=field12700" json:"field12700,omitempty"`
+
+	Field12699 *string       `protobuf:"bytes,1,opt,name=field12699" json:"field12699,omitempty"`
+	Field12700 *Message12685 `protobuf:"bytes,2,opt,name=field12700" json:"field12700,omitempty"`
 }
 
 func (x *Message12686) Reset() {
@@ -145,16 +147,17 @@ type Message11975 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11992    *string         `protobuf:"bytes,1,opt,name=field11992" json:"field11992,omitempty"`
-	Field11993    *int32          `protobuf:"varint,2,opt,name=field11993" json:"field11993,omitempty"`
-	Field11994    []*Message10320 `protobuf:"bytes,3,rep,name=field11994" json:"field11994,omitempty"`
-	Field11995    *Message11947   `protobuf:"bytes,4,opt,name=field11995" json:"field11995,omitempty"`
-	Field11996    *Message11920   `protobuf:"bytes,5,opt,name=field11996" json:"field11996,omitempty"`
-	Field11997    *bool           `protobuf:"varint,6,opt,name=field11997" json:"field11997,omitempty"`
-	Field11998    []string        `protobuf:"bytes,7,rep,name=field11998" json:"field11998,omitempty"`
-	Field11999    *float32        `protobuf:"fixed32,8,opt,name=field11999" json:"field11999,omitempty"`
-	Field12000    []UnusedEnum    `protobuf:"varint,9,rep,name=field12000,enum=benchmarks.google_message4.UnusedEnum" json:"field12000,omitempty"`
-	Field12001    *int32          `protobuf:"varint,11,opt,name=field12001" json:"field12001,omitempty"`
+
+	Field11992 *string         `protobuf:"bytes,1,opt,name=field11992" json:"field11992,omitempty"`
+	Field11993 *int32          `protobuf:"varint,2,opt,name=field11993" json:"field11993,omitempty"`
+	Field11994 []*Message10320 `protobuf:"bytes,3,rep,name=field11994" json:"field11994,omitempty"`
+	Field11995 *Message11947   `protobuf:"bytes,4,opt,name=field11995" json:"field11995,omitempty"`
+	Field11996 *Message11920   `protobuf:"bytes,5,opt,name=field11996" json:"field11996,omitempty"`
+	Field11997 *bool           `protobuf:"varint,6,opt,name=field11997" json:"field11997,omitempty"`
+	Field11998 []string        `protobuf:"bytes,7,rep,name=field11998" json:"field11998,omitempty"`
+	Field11999 *float32        `protobuf:"fixed32,8,opt,name=field11999" json:"field11999,omitempty"`
+	Field12000 []UnusedEnum    `protobuf:"varint,9,rep,name=field12000,enum=benchmarks.google_message4.UnusedEnum" json:"field12000,omitempty"`
+	Field12001 *int32          `protobuf:"varint,11,opt,name=field12001" json:"field12001,omitempty"`
 }
 
 func (x *Message11975) Reset() {
@@ -258,14 +261,15 @@ type Message7287 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7311     *Message6133        `protobuf:"bytes,1,opt,name=field7311" json:"field7311,omitempty"`
-	Field7312     *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field7312" json:"field7312,omitempty"`
-	Field7313     *string             `protobuf:"bytes,3,opt,name=field7313" json:"field7313,omitempty"`
-	Field7314     *Message6643        `protobuf:"bytes,4,opt,name=field7314" json:"field7314,omitempty"`
-	Field7315     *Enum7288           `protobuf:"varint,5,opt,name=field7315,enum=benchmarks.google_message4.Enum7288" json:"field7315,omitempty"`
-	Field7316     []byte              `protobuf:"bytes,6,opt,name=field7316" json:"field7316,omitempty"`
-	Field7317     *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field7317" json:"field7317,omitempty"`
-	Field7318     *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field7318" json:"field7318,omitempty"`
+
+	Field7311 *Message6133        `protobuf:"bytes,1,opt,name=field7311" json:"field7311,omitempty"`
+	Field7312 *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field7312" json:"field7312,omitempty"`
+	Field7313 *string             `protobuf:"bytes,3,opt,name=field7313" json:"field7313,omitempty"`
+	Field7314 *Message6643        `protobuf:"bytes,4,opt,name=field7314" json:"field7314,omitempty"`
+	Field7315 *Enum7288           `protobuf:"varint,5,opt,name=field7315,enum=benchmarks.google_message4.Enum7288" json:"field7315,omitempty"`
+	Field7316 []byte              `protobuf:"bytes,6,opt,name=field7316" json:"field7316,omitempty"`
+	Field7317 *UnusedEmptyMessage `protobuf:"bytes,7,opt,name=field7317" json:"field7317,omitempty"`
+	Field7318 *UnusedEmptyMessage `protobuf:"bytes,9,opt,name=field7318" json:"field7318,omitempty"`
 }
 
 func (x *Message7287) Reset() {
@@ -355,54 +359,55 @@ type Message3061 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3286     *string                    `protobuf:"bytes,2,opt,name=field3286" json:"field3286,omitempty"`
-	Field3287     *int32                     `protobuf:"varint,77,opt,name=field3287" json:"field3287,omitempty"`
-	Field3288     *string                    `protobuf:"bytes,49,opt,name=field3288" json:"field3288,omitempty"`
-	Field3289     *Message3046               `protobuf:"bytes,3,req,name=field3289" json:"field3289,omitempty"`
-	Field3290     *Message3046               `protobuf:"bytes,58,opt,name=field3290" json:"field3290,omitempty"`
-	Message3062   *Message3061_Message3062   `protobuf:"group,4,opt,name=Message3062,json=message3062" json:"message3062,omitempty"`
-	Field3292     *Message3060               `protobuf:"bytes,104,opt,name=field3292" json:"field3292,omitempty"`
-	Field3293     *int64                     `protobuf:"varint,32,opt,name=field3293" json:"field3293,omitempty"`
-	Field3294     *int32                     `protobuf:"varint,41,opt,name=field3294" json:"field3294,omitempty"`
-	Message3063   *Message3061_Message3063   `protobuf:"group,13,opt,name=Message3063,json=message3063" json:"message3063,omitempty"`
-	Field3296     *Enum2834                  `protobuf:"varint,94,opt,name=field3296,enum=benchmarks.google_message4.Enum2834" json:"field3296,omitempty"`
-	Field3297     *bool                      `protobuf:"varint,25,opt,name=field3297" json:"field3297,omitempty"`
-	Field3298     *bool                      `protobuf:"varint,50,opt,name=field3298" json:"field3298,omitempty"`
-	Field3299     *string                    `protobuf:"bytes,89,opt,name=field3299" json:"field3299,omitempty"`
-	Field3300     *string                    `protobuf:"bytes,91,opt,name=field3300" json:"field3300,omitempty"`
-	Field3301     *string                    `protobuf:"bytes,105,opt,name=field3301" json:"field3301,omitempty"`
-	Field3302     *Message3050               `protobuf:"bytes,53,opt,name=field3302" json:"field3302,omitempty"`
-	Field3303     *uint64                    `protobuf:"fixed64,51,opt,name=field3303" json:"field3303,omitempty"`
-	Field3304     *uint64                    `protobuf:"fixed64,106,opt,name=field3304" json:"field3304,omitempty"`
-	Field3305     *int32                     `protobuf:"varint,60,opt,name=field3305" json:"field3305,omitempty"`
-	Field3306     *string                    `protobuf:"bytes,44,opt,name=field3306" json:"field3306,omitempty"`
-	Field3307     []byte                     `protobuf:"bytes,81,opt,name=field3307" json:"field3307,omitempty"`
-	Field3308     *string                    `protobuf:"bytes,70,opt,name=field3308" json:"field3308,omitempty"`
-	Field3309     []byte                     `protobuf:"bytes,45,opt,name=field3309" json:"field3309,omitempty"`
-	Field3310     *Enum2806                  `protobuf:"varint,71,opt,name=field3310,enum=benchmarks.google_message4.Enum2806" json:"field3310,omitempty"`
-	Field3311     *int32                     `protobuf:"varint,72,opt,name=field3311" json:"field3311,omitempty"`
-	Field3312     []byte                     `protobuf:"bytes,78,opt,name=field3312" json:"field3312,omitempty"`
-	Field3313     *int32                     `protobuf:"varint,20,opt,name=field3313" json:"field3313,omitempty"`
-	Message3064   []*Message3061_Message3064 `protobuf:"group,8,rep,name=Message3064,json=message3064" json:"message3064,omitempty"`
-	Field3315     *UnusedEmptyMessage        `protobuf:"bytes,39,opt,name=field3315" json:"field3315,omitempty"`
-	Field3316     *int32                     `protobuf:"varint,76,opt,name=field3316" json:"field3316,omitempty"`
-	Message3065   *Message3061_Message3065   `protobuf:"group,63,opt,name=Message3065,json=message3065" json:"message3065,omitempty"`
-	Field3318     *Enum2806                  `protobuf:"varint,54,opt,name=field3318,enum=benchmarks.google_message4.Enum2806" json:"field3318,omitempty"`
-	Field3319     *int32                     `protobuf:"varint,46,opt,name=field3319" json:"field3319,omitempty"`
-	Field3320     []string                   `protobuf:"bytes,24,rep,name=field3320" json:"field3320,omitempty"`
-	Field3321     *uint32                    `protobuf:"fixed32,38,opt,name=field3321" json:"field3321,omitempty"`
-	Field3322     []byte                     `protobuf:"bytes,99,opt,name=field3322" json:"field3322,omitempty"`
-	Field3323     *uint64                    `protobuf:"fixed64,1,opt,name=field3323" json:"field3323,omitempty"`
-	Field3324     *uint64                    `protobuf:"fixed64,97,opt,name=field3324" json:"field3324,omitempty"`
-	Field3325     []*Message3040             `protobuf:"bytes,16,rep,name=field3325" json:"field3325,omitempty"`
-	Field3326     []*Message3041             `protobuf:"bytes,61,rep,name=field3326" json:"field3326,omitempty"`
-	Message3066   *Message3061_Message3066   `protobuf:"group,21,opt,name=Message3066,json=message3066" json:"message3066,omitempty"`
-	Field3328     *UnusedEmptyMessage        `protobuf:"bytes,47,opt,name=field3328" json:"field3328,omitempty"`
-	Field3329     *UnusedEmptyMessage        `protobuf:"bytes,48,opt,name=field3329" json:"field3329,omitempty"`
-	Field3330     *uint64                    `protobuf:"fixed64,40,opt,name=field3330" json:"field3330,omitempty"`
-	Field3331     *UnusedEmptyMessage        `protobuf:"bytes,86,opt,name=field3331" json:"field3331,omitempty"`
-	Field3332     *UnusedEmptyMessage        `protobuf:"bytes,59,opt,name=field3332" json:"field3332,omitempty"`
-	Field3333     *int32                     `protobuf:"varint,17,opt,name=field3333" json:"field3333,omitempty"`
+
+	Field3286   *string                    `protobuf:"bytes,2,opt,name=field3286" json:"field3286,omitempty"`
+	Field3287   *int32                     `protobuf:"varint,77,opt,name=field3287" json:"field3287,omitempty"`
+	Field3288   *string                    `protobuf:"bytes,49,opt,name=field3288" json:"field3288,omitempty"`
+	Field3289   *Message3046               `protobuf:"bytes,3,req,name=field3289" json:"field3289,omitempty"`
+	Field3290   *Message3046               `protobuf:"bytes,58,opt,name=field3290" json:"field3290,omitempty"`
+	Message3062 *Message3061_Message3062   `protobuf:"group,4,opt,name=Message3062,json=message3062" json:"message3062,omitempty"`
+	Field3292   *Message3060               `protobuf:"bytes,104,opt,name=field3292" json:"field3292,omitempty"`
+	Field3293   *int64                     `protobuf:"varint,32,opt,name=field3293" json:"field3293,omitempty"`
+	Field3294   *int32                     `protobuf:"varint,41,opt,name=field3294" json:"field3294,omitempty"`
+	Message3063 *Message3061_Message3063   `protobuf:"group,13,opt,name=Message3063,json=message3063" json:"message3063,omitempty"`
+	Field3296   *Enum2834                  `protobuf:"varint,94,opt,name=field3296,enum=benchmarks.google_message4.Enum2834" json:"field3296,omitempty"`
+	Field3297   *bool                      `protobuf:"varint,25,opt,name=field3297" json:"field3297,omitempty"`
+	Field3298   *bool                      `protobuf:"varint,50,opt,name=field3298" json:"field3298,omitempty"`
+	Field3299   *string                    `protobuf:"bytes,89,opt,name=field3299" json:"field3299,omitempty"`
+	Field3300   *string                    `protobuf:"bytes,91,opt,name=field3300" json:"field3300,omitempty"`
+	Field3301   *string                    `protobuf:"bytes,105,opt,name=field3301" json:"field3301,omitempty"`
+	Field3302   *Message3050               `protobuf:"bytes,53,opt,name=field3302" json:"field3302,omitempty"`
+	Field3303   *uint64                    `protobuf:"fixed64,51,opt,name=field3303" json:"field3303,omitempty"`
+	Field3304   *uint64                    `protobuf:"fixed64,106,opt,name=field3304" json:"field3304,omitempty"`
+	Field3305   *int32                     `protobuf:"varint,60,opt,name=field3305" json:"field3305,omitempty"`
+	Field3306   *string                    `protobuf:"bytes,44,opt,name=field3306" json:"field3306,omitempty"`
+	Field3307   []byte                     `protobuf:"bytes,81,opt,name=field3307" json:"field3307,omitempty"`
+	Field3308   *string                    `protobuf:"bytes,70,opt,name=field3308" json:"field3308,omitempty"`
+	Field3309   []byte                     `protobuf:"bytes,45,opt,name=field3309" json:"field3309,omitempty"`
+	Field3310   *Enum2806                  `protobuf:"varint,71,opt,name=field3310,enum=benchmarks.google_message4.Enum2806" json:"field3310,omitempty"`
+	Field3311   *int32                     `protobuf:"varint,72,opt,name=field3311" json:"field3311,omitempty"`
+	Field3312   []byte                     `protobuf:"bytes,78,opt,name=field3312" json:"field3312,omitempty"`
+	Field3313   *int32                     `protobuf:"varint,20,opt,name=field3313" json:"field3313,omitempty"`
+	Message3064 []*Message3061_Message3064 `protobuf:"group,8,rep,name=Message3064,json=message3064" json:"message3064,omitempty"`
+	Field3315   *UnusedEmptyMessage        `protobuf:"bytes,39,opt,name=field3315" json:"field3315,omitempty"`
+	Field3316   *int32                     `protobuf:"varint,76,opt,name=field3316" json:"field3316,omitempty"`
+	Message3065 *Message3061_Message3065   `protobuf:"group,63,opt,name=Message3065,json=message3065" json:"message3065,omitempty"`
+	Field3318   *Enum2806                  `protobuf:"varint,54,opt,name=field3318,enum=benchmarks.google_message4.Enum2806" json:"field3318,omitempty"`
+	Field3319   *int32                     `protobuf:"varint,46,opt,name=field3319" json:"field3319,omitempty"`
+	Field3320   []string                   `protobuf:"bytes,24,rep,name=field3320" json:"field3320,omitempty"`
+	Field3321   *uint32                    `protobuf:"fixed32,38,opt,name=field3321" json:"field3321,omitempty"`
+	Field3322   []byte                     `protobuf:"bytes,99,opt,name=field3322" json:"field3322,omitempty"`
+	Field3323   *uint64                    `protobuf:"fixed64,1,opt,name=field3323" json:"field3323,omitempty"`
+	Field3324   *uint64                    `protobuf:"fixed64,97,opt,name=field3324" json:"field3324,omitempty"`
+	Field3325   []*Message3040             `protobuf:"bytes,16,rep,name=field3325" json:"field3325,omitempty"`
+	Field3326   []*Message3041             `protobuf:"bytes,61,rep,name=field3326" json:"field3326,omitempty"`
+	Message3066 *Message3061_Message3066   `protobuf:"group,21,opt,name=Message3066,json=message3066" json:"message3066,omitempty"`
+	Field3328   *UnusedEmptyMessage        `protobuf:"bytes,47,opt,name=field3328" json:"field3328,omitempty"`
+	Field3329   *UnusedEmptyMessage        `protobuf:"bytes,48,opt,name=field3329" json:"field3329,omitempty"`
+	Field3330   *uint64                    `protobuf:"fixed64,40,opt,name=field3330" json:"field3330,omitempty"`
+	Field3331   *UnusedEmptyMessage        `protobuf:"bytes,86,opt,name=field3331" json:"field3331,omitempty"`
+	Field3332   *UnusedEmptyMessage        `protobuf:"bytes,59,opt,name=field3332" json:"field3332,omitempty"`
+	Field3333   *int32                     `protobuf:"varint,17,opt,name=field3333" json:"field3333,omitempty"`
 }
 
 func (x *Message3061) Reset() {
@@ -805,56 +810,57 @@ type Message8572 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8647     []byte              `protobuf:"bytes,1,opt,name=field8647" json:"field8647,omitempty"`
-	Field8648     []byte              `protobuf:"bytes,3,opt,name=field8648" json:"field8648,omitempty"`
-	Field8649     *Message3886        `protobuf:"bytes,4,opt,name=field8649" json:"field8649,omitempty"`
-	Field8650     *Message3919        `protobuf:"bytes,57,opt,name=field8650" json:"field8650,omitempty"`
-	Field8651     *bool               `protobuf:"varint,5,opt,name=field8651" json:"field8651,omitempty"`
-	Field8652     *int32              `protobuf:"varint,6,opt,name=field8652" json:"field8652,omitempty"`
-	Field8653     *int32              `protobuf:"varint,49,opt,name=field8653" json:"field8653,omitempty"`
-	Field8654     *Message7905        `protobuf:"bytes,7,opt,name=field8654" json:"field8654,omitempty"`
-	Field8655     *int32              `protobuf:"varint,10,opt,name=field8655" json:"field8655,omitempty"`
-	Field8656     *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field8656" json:"field8656,omitempty"`
-	Field8657     *bool               `protobuf:"varint,35,opt,name=field8657" json:"field8657,omitempty"`
-	Field8658     []byte              `protobuf:"bytes,12,opt,name=field8658" json:"field8658,omitempty"`
-	Field8659     *string             `protobuf:"bytes,14,opt,name=field8659" json:"field8659,omitempty"`
-	Field8660     *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field8660" json:"field8660,omitempty"`
-	Field8661     []byte              `protobuf:"bytes,15,opt,name=field8661" json:"field8661,omitempty"`
-	Field8662     *UnusedEmptyMessage `protobuf:"bytes,17,opt,name=field8662" json:"field8662,omitempty"`
-	Field8663     *int32              `protobuf:"varint,18,opt,name=field8663" json:"field8663,omitempty"`
-	Field8664     *int32              `protobuf:"varint,19,opt,name=field8664" json:"field8664,omitempty"`
-	Field8665     *bool               `protobuf:"varint,20,opt,name=field8665" json:"field8665,omitempty"`
-	Field8666     *Enum3476           `protobuf:"varint,31,opt,name=field8666,enum=benchmarks.google_message4.Enum3476" json:"field8666,omitempty"`
-	Field8667     *bool               `protobuf:"varint,36,opt,name=field8667" json:"field8667,omitempty"`
-	Field8668     *UnusedEmptyMessage `protobuf:"bytes,39,opt,name=field8668" json:"field8668,omitempty"`
-	Field8669     []byte              `protobuf:"bytes,22,opt,name=field8669" json:"field8669,omitempty"`
-	Field8670     *int32              `protobuf:"varint,24,opt,name=field8670" json:"field8670,omitempty"`
-	Field8671     *Message3052        `protobuf:"bytes,25,opt,name=field8671" json:"field8671,omitempty"`
-	Field8672     []byte              `protobuf:"bytes,26,opt,name=field8672" json:"field8672,omitempty"`
-	Field8673     []byte              `protobuf:"bytes,28,opt,name=field8673" json:"field8673,omitempty"`
-	Field8674     *int32              `protobuf:"varint,29,opt,name=field8674" json:"field8674,omitempty"`
-	Field8675     []byte              `protobuf:"bytes,30,opt,name=field8675" json:"field8675,omitempty"`
-	Field8676     []byte              `protobuf:"bytes,32,opt,name=field8676" json:"field8676,omitempty"`
-	Field8677     *string             `protobuf:"bytes,33,opt,name=field8677" json:"field8677,omitempty"`
-	Field8678     *int32              `protobuf:"varint,34,opt,name=field8678" json:"field8678,omitempty"`
-	Field8679     *int32              `protobuf:"varint,37,opt,name=field8679" json:"field8679,omitempty"`
-	Field8680     *float64            `protobuf:"fixed64,38,opt,name=field8680" json:"field8680,omitempty"`
-	Field8681     *float64            `protobuf:"fixed64,42,opt,name=field8681" json:"field8681,omitempty"`
-	Field8682     *Message3922        `protobuf:"bytes,40,opt,name=field8682" json:"field8682,omitempty"`
-	Field8683     *UnusedEmptyMessage `protobuf:"bytes,43,opt,name=field8683" json:"field8683,omitempty"`
-	Field8684     *int64              `protobuf:"varint,44,opt,name=field8684" json:"field8684,omitempty"`
-	Field8685     *Message7929        `protobuf:"bytes,45,opt,name=field8685" json:"field8685,omitempty"`
-	Field8686     *uint64             `protobuf:"varint,46,opt,name=field8686" json:"field8686,omitempty"`
-	Field8687     *uint32             `protobuf:"varint,48,opt,name=field8687" json:"field8687,omitempty"`
-	Field8688     *Message7843        `protobuf:"bytes,47,opt,name=field8688" json:"field8688,omitempty"`
-	Field8689     *Message7864        `protobuf:"bytes,50,opt,name=field8689" json:"field8689,omitempty"`
-	Field8690     *UnusedEmptyMessage `protobuf:"bytes,52,opt,name=field8690" json:"field8690,omitempty"`
-	Field8691     *bool               `protobuf:"varint,58,opt,name=field8691" json:"field8691,omitempty"`
-	Field8692     *bool               `protobuf:"varint,54,opt,name=field8692" json:"field8692,omitempty"`
-	Field8693     *string             `protobuf:"bytes,55,opt,name=field8693" json:"field8693,omitempty"`
-	Field8694     *UnusedEmptyMessage `protobuf:"bytes,41,opt,name=field8694" json:"field8694,omitempty"`
-	Field8695     *UnusedEmptyMessage `protobuf:"bytes,53,opt,name=field8695" json:"field8695,omitempty"`
-	Field8696     *Message8575        `protobuf:"bytes,61,opt,name=field8696" json:"field8696,omitempty"`
+
+	Field8647 []byte              `protobuf:"bytes,1,opt,name=field8647" json:"field8647,omitempty"`
+	Field8648 []byte              `protobuf:"bytes,3,opt,name=field8648" json:"field8648,omitempty"`
+	Field8649 *Message3886        `protobuf:"bytes,4,opt,name=field8649" json:"field8649,omitempty"`
+	Field8650 *Message3919        `protobuf:"bytes,57,opt,name=field8650" json:"field8650,omitempty"`
+	Field8651 *bool               `protobuf:"varint,5,opt,name=field8651" json:"field8651,omitempty"`
+	Field8652 *int32              `protobuf:"varint,6,opt,name=field8652" json:"field8652,omitempty"`
+	Field8653 *int32              `protobuf:"varint,49,opt,name=field8653" json:"field8653,omitempty"`
+	Field8654 *Message7905        `protobuf:"bytes,7,opt,name=field8654" json:"field8654,omitempty"`
+	Field8655 *int32              `protobuf:"varint,10,opt,name=field8655" json:"field8655,omitempty"`
+	Field8656 *UnusedEmptyMessage `protobuf:"bytes,11,opt,name=field8656" json:"field8656,omitempty"`
+	Field8657 *bool               `protobuf:"varint,35,opt,name=field8657" json:"field8657,omitempty"`
+	Field8658 []byte              `protobuf:"bytes,12,opt,name=field8658" json:"field8658,omitempty"`
+	Field8659 *string             `protobuf:"bytes,14,opt,name=field8659" json:"field8659,omitempty"`
+	Field8660 *UnusedEmptyMessage `protobuf:"bytes,13,opt,name=field8660" json:"field8660,omitempty"`
+	Field8661 []byte              `protobuf:"bytes,15,opt,name=field8661" json:"field8661,omitempty"`
+	Field8662 *UnusedEmptyMessage `protobuf:"bytes,17,opt,name=field8662" json:"field8662,omitempty"`
+	Field8663 *int32              `protobuf:"varint,18,opt,name=field8663" json:"field8663,omitempty"`
+	Field8664 *int32              `protobuf:"varint,19,opt,name=field8664" json:"field8664,omitempty"`
+	Field8665 *bool               `protobuf:"varint,20,opt,name=field8665" json:"field8665,omitempty"`
+	Field8666 *Enum3476           `protobuf:"varint,31,opt,name=field8666,enum=benchmarks.google_message4.Enum3476" json:"field8666,omitempty"`
+	Field8667 *bool               `protobuf:"varint,36,opt,name=field8667" json:"field8667,omitempty"`
+	Field8668 *UnusedEmptyMessage `protobuf:"bytes,39,opt,name=field8668" json:"field8668,omitempty"`
+	Field8669 []byte              `protobuf:"bytes,22,opt,name=field8669" json:"field8669,omitempty"`
+	Field8670 *int32              `protobuf:"varint,24,opt,name=field8670" json:"field8670,omitempty"`
+	Field8671 *Message3052        `protobuf:"bytes,25,opt,name=field8671" json:"field8671,omitempty"`
+	Field8672 []byte              `protobuf:"bytes,26,opt,name=field8672" json:"field8672,omitempty"`
+	Field8673 []byte              `protobuf:"bytes,28,opt,name=field8673" json:"field8673,omitempty"`
+	Field8674 *int32              `protobuf:"varint,29,opt,name=field8674" json:"field8674,omitempty"`
+	Field8675 []byte              `protobuf:"bytes,30,opt,name=field8675" json:"field8675,omitempty"`
+	Field8676 []byte              `protobuf:"bytes,32,opt,name=field8676" json:"field8676,omitempty"`
+	Field8677 *string             `protobuf:"bytes,33,opt,name=field8677" json:"field8677,omitempty"`
+	Field8678 *int32              `protobuf:"varint,34,opt,name=field8678" json:"field8678,omitempty"`
+	Field8679 *int32              `protobuf:"varint,37,opt,name=field8679" json:"field8679,omitempty"`
+	Field8680 *float64            `protobuf:"fixed64,38,opt,name=field8680" json:"field8680,omitempty"`
+	Field8681 *float64            `protobuf:"fixed64,42,opt,name=field8681" json:"field8681,omitempty"`
+	Field8682 *Message3922        `protobuf:"bytes,40,opt,name=field8682" json:"field8682,omitempty"`
+	Field8683 *UnusedEmptyMessage `protobuf:"bytes,43,opt,name=field8683" json:"field8683,omitempty"`
+	Field8684 *int64              `protobuf:"varint,44,opt,name=field8684" json:"field8684,omitempty"`
+	Field8685 *Message7929        `protobuf:"bytes,45,opt,name=field8685" json:"field8685,omitempty"`
+	Field8686 *uint64             `protobuf:"varint,46,opt,name=field8686" json:"field8686,omitempty"`
+	Field8687 *uint32             `protobuf:"varint,48,opt,name=field8687" json:"field8687,omitempty"`
+	Field8688 *Message7843        `protobuf:"bytes,47,opt,name=field8688" json:"field8688,omitempty"`
+	Field8689 *Message7864        `protobuf:"bytes,50,opt,name=field8689" json:"field8689,omitempty"`
+	Field8690 *UnusedEmptyMessage `protobuf:"bytes,52,opt,name=field8690" json:"field8690,omitempty"`
+	Field8691 *bool               `protobuf:"varint,58,opt,name=field8691" json:"field8691,omitempty"`
+	Field8692 *bool               `protobuf:"varint,54,opt,name=field8692" json:"field8692,omitempty"`
+	Field8693 *string             `protobuf:"bytes,55,opt,name=field8693" json:"field8693,omitempty"`
+	Field8694 *UnusedEmptyMessage `protobuf:"bytes,41,opt,name=field8694" json:"field8694,omitempty"`
+	Field8695 *UnusedEmptyMessage `protobuf:"bytes,53,opt,name=field8695" json:"field8695,omitempty"`
+	Field8696 *Message8575        `protobuf:"bytes,61,opt,name=field8696" json:"field8696,omitempty"`
 }
 
 func (x *Message8572) Reset() {
@@ -1238,11 +1244,12 @@ type Message8774 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field8810     *string `protobuf:"bytes,1,opt,name=field8810" json:"field8810,omitempty"`
-	Field8811     *string `protobuf:"bytes,2,opt,name=field8811" json:"field8811,omitempty"`
-	Field8812     *string `protobuf:"bytes,3,opt,name=field8812" json:"field8812,omitempty"`
-	Field8813     *string `protobuf:"bytes,4,opt,name=field8813" json:"field8813,omitempty"`
-	Field8814     *string `protobuf:"bytes,5,opt,name=field8814" json:"field8814,omitempty"`
+
+	Field8810 *string `protobuf:"bytes,1,opt,name=field8810" json:"field8810,omitempty"`
+	Field8811 *string `protobuf:"bytes,2,opt,name=field8811" json:"field8811,omitempty"`
+	Field8812 *string `protobuf:"bytes,3,opt,name=field8812" json:"field8812,omitempty"`
+	Field8813 *string `protobuf:"bytes,4,opt,name=field8813" json:"field8813,omitempty"`
+	Field8814 *string `protobuf:"bytes,5,opt,name=field8814" json:"field8814,omitempty"`
 }
 
 func (x *Message8774) Reset() {
@@ -1312,16 +1319,17 @@ type Message12776 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field12786      *string             `protobuf:"bytes,1,opt,name=field12786" json:"field12786,omitempty"`
-	Field12787      *uint64             `protobuf:"fixed64,11,opt,name=field12787" json:"field12787,omitempty"`
-	Field12788      *int32              `protobuf:"varint,6,opt,name=field12788" json:"field12788,omitempty"`
-	Field12789      *int32              `protobuf:"varint,13,opt,name=field12789" json:"field12789,omitempty"`
-	Field12790      *int32              `protobuf:"varint,14,opt,name=field12790" json:"field12790,omitempty"`
-	Field12791      *int32              `protobuf:"varint,15,opt,name=field12791" json:"field12791,omitempty"`
-	Field12792      *int32              `protobuf:"varint,16,opt,name=field12792" json:"field12792,omitempty"`
-	Field12793      *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field12793" json:"field12793,omitempty"`
-	Field12794      *Message12774       `protobuf:"bytes,10,opt,name=field12794" json:"field12794,omitempty"`
-	Field12795      *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field12795" json:"field12795,omitempty"`
+
+	Field12786 *string             `protobuf:"bytes,1,opt,name=field12786" json:"field12786,omitempty"`
+	Field12787 *uint64             `protobuf:"fixed64,11,opt,name=field12787" json:"field12787,omitempty"`
+	Field12788 *int32              `protobuf:"varint,6,opt,name=field12788" json:"field12788,omitempty"`
+	Field12789 *int32              `protobuf:"varint,13,opt,name=field12789" json:"field12789,omitempty"`
+	Field12790 *int32              `protobuf:"varint,14,opt,name=field12790" json:"field12790,omitempty"`
+	Field12791 *int32              `protobuf:"varint,15,opt,name=field12791" json:"field12791,omitempty"`
+	Field12792 *int32              `protobuf:"varint,16,opt,name=field12792" json:"field12792,omitempty"`
+	Field12793 *UnusedEmptyMessage `protobuf:"bytes,8,opt,name=field12793" json:"field12793,omitempty"`
+	Field12794 *Message12774       `protobuf:"bytes,10,opt,name=field12794" json:"field12794,omitempty"`
+	Field12795 *UnusedEmptyMessage `protobuf:"bytes,12,opt,name=field12795" json:"field12795,omitempty"`
 }
 
 func (x *Message12776) Reset() {
@@ -1439,10 +1447,11 @@ type Message12798 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12805    *int32        `protobuf:"varint,1,opt,name=field12805" json:"field12805,omitempty"`
-	Field12806    *int32        `protobuf:"varint,2,opt,name=field12806" json:"field12806,omitempty"`
-	Field12807    *Message12774 `protobuf:"bytes,6,opt,name=field12807" json:"field12807,omitempty"`
-	Field12808    *bool         `protobuf:"varint,7,opt,name=field12808" json:"field12808,omitempty"`
+
+	Field12805 *int32        `protobuf:"varint,1,opt,name=field12805" json:"field12805,omitempty"`
+	Field12806 *int32        `protobuf:"varint,2,opt,name=field12806" json:"field12806,omitempty"`
+	Field12807 *Message12774 `protobuf:"bytes,6,opt,name=field12807" json:"field12807,omitempty"`
+	Field12808 *bool         `protobuf:"varint,7,opt,name=field12808" json:"field12808,omitempty"`
 }
 
 func (x *Message12798) Reset() {
@@ -1504,9 +1513,10 @@ type Message12797 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12802    *Message12796   `protobuf:"bytes,1,opt,name=field12802" json:"field12802,omitempty"`
-	Field12803    []*Message12796 `protobuf:"bytes,2,rep,name=field12803" json:"field12803,omitempty"`
-	Field12804    *string         `protobuf:"bytes,3,opt,name=field12804" json:"field12804,omitempty"`
+
+	Field12802 *Message12796   `protobuf:"bytes,1,opt,name=field12802" json:"field12802,omitempty"`
+	Field12803 []*Message12796 `protobuf:"bytes,2,rep,name=field12803" json:"field12803,omitempty"`
+	Field12804 *string         `protobuf:"bytes,3,opt,name=field12804" json:"field12804,omitempty"`
 }
 
 func (x *Message12797) Reset() {
@@ -1561,13 +1571,14 @@ type Message12825 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12862    []*Message12818       `protobuf:"bytes,1,rep,name=field12862" json:"field12862,omitempty"`
-	Field12863    *int32                `protobuf:"varint,2,opt,name=field12863" json:"field12863,omitempty"`
-	Field12864    *Message12819         `protobuf:"bytes,3,opt,name=field12864" json:"field12864,omitempty"`
-	Field12865    *Message12820         `protobuf:"bytes,4,opt,name=field12865" json:"field12865,omitempty"`
-	Field12866    *int32                `protobuf:"varint,5,opt,name=field12866" json:"field12866,omitempty"`
-	Field12867    []*Message12821       `protobuf:"bytes,6,rep,name=field12867" json:"field12867,omitempty"`
-	Field12868    []*UnusedEmptyMessage `protobuf:"bytes,7,rep,name=field12868" json:"field12868,omitempty"`
+
+	Field12862 []*Message12818       `protobuf:"bytes,1,rep,name=field12862" json:"field12862,omitempty"`
+	Field12863 *int32                `protobuf:"varint,2,opt,name=field12863" json:"field12863,omitempty"`
+	Field12864 *Message12819         `protobuf:"bytes,3,opt,name=field12864" json:"field12864,omitempty"`
+	Field12865 *Message12820         `protobuf:"bytes,4,opt,name=field12865" json:"field12865,omitempty"`
+	Field12866 *int32                `protobuf:"varint,5,opt,name=field12866" json:"field12866,omitempty"`
+	Field12867 []*Message12821       `protobuf:"bytes,6,rep,name=field12867" json:"field12867,omitempty"`
+	Field12868 []*UnusedEmptyMessage `protobuf:"bytes,7,rep,name=field12868" json:"field12868,omitempty"`
 }
 
 func (x *Message12825) Reset() {
@@ -1716,8 +1727,9 @@ type Message1374 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field1375     *string `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
-	Field1376     *string `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
+
+	Field1375 *string `protobuf:"bytes,1,req,name=field1375" json:"field1375,omitempty"`
+	Field1376 *string `protobuf:"bytes,2,opt,name=field1376" json:"field1376,omitempty"`
 }
 
 func (x *Message1374) Reset() {
@@ -1765,8 +1777,9 @@ type Message2462 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field2496     []byte   `protobuf:"bytes,1,req,name=field2496" json:"field2496,omitempty"`
-	Field2497     *float64 `protobuf:"fixed64,2,req,name=field2497" json:"field2497,omitempty"`
+
+	Field2496 []byte   `protobuf:"bytes,1,req,name=field2496" json:"field2496,omitempty"`
+	Field2497 *float64 `protobuf:"fixed64,2,req,name=field2497" json:"field2497,omitempty"`
 }
 
 func (x *Message2462) Reset() {
@@ -1814,13 +1827,14 @@ type Message12685 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12692    []string `protobuf:"bytes,1,rep,name=field12692" json:"field12692,omitempty"`
-	Field12693    []string `protobuf:"bytes,2,rep,name=field12693" json:"field12693,omitempty"`
-	Field12694    *int64   `protobuf:"varint,3,opt,name=field12694" json:"field12694,omitempty"`
-	Field12695    *uint32  `protobuf:"varint,4,opt,name=field12695" json:"field12695,omitempty"`
-	Field12696    []string `protobuf:"bytes,5,rep,name=field12696" json:"field12696,omitempty"`
-	Field12697    *string  `protobuf:"bytes,6,opt,name=field12697" json:"field12697,omitempty"`
-	Field12698    *string  `protobuf:"bytes,7,opt,name=field12698" json:"field12698,omitempty"`
+
+	Field12692 []string `protobuf:"bytes,1,rep,name=field12692" json:"field12692,omitempty"`
+	Field12693 []string `protobuf:"bytes,2,rep,name=field12693" json:"field12693,omitempty"`
+	Field12694 *int64   `protobuf:"varint,3,opt,name=field12694" json:"field12694,omitempty"`
+	Field12695 *uint32  `protobuf:"varint,4,opt,name=field12695" json:"field12695,omitempty"`
+	Field12696 []string `protobuf:"bytes,5,rep,name=field12696" json:"field12696,omitempty"`
+	Field12697 *string  `protobuf:"bytes,6,opt,name=field12697" json:"field12697,omitempty"`
+	Field12698 *string  `protobuf:"bytes,7,opt,name=field12698" json:"field12698,omitempty"`
 }
 
 func (x *Message12685) Reset() {
@@ -1903,13 +1917,14 @@ type Message10320 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10347    *Enum10335      `protobuf:"varint,1,opt,name=field10347,enum=benchmarks.google_message4.Enum10335" json:"field10347,omitempty"`
-	Field10348    []*Message10319 `protobuf:"bytes,2,rep,name=field10348" json:"field10348,omitempty"`
-	Field10349    *int32          `protobuf:"varint,3,opt,name=field10349" json:"field10349,omitempty"`
-	Field10350    *int32          `protobuf:"varint,4,opt,name=field10350" json:"field10350,omitempty"`
-	Field10351    *int32          `protobuf:"varint,5,opt,name=field10351" json:"field10351,omitempty"`
-	Field10352    *int32          `protobuf:"varint,6,opt,name=field10352" json:"field10352,omitempty"`
-	Field10353    *Enum10337      `protobuf:"varint,7,opt,name=field10353,enum=benchmarks.google_message4.Enum10337" json:"field10353,omitempty"`
+
+	Field10347 *Enum10335      `protobuf:"varint,1,opt,name=field10347,enum=benchmarks.google_message4.Enum10335" json:"field10347,omitempty"`
+	Field10348 []*Message10319 `protobuf:"bytes,2,rep,name=field10348" json:"field10348,omitempty"`
+	Field10349 *int32          `protobuf:"varint,3,opt,name=field10349" json:"field10349,omitempty"`
+	Field10350 *int32          `protobuf:"varint,4,opt,name=field10350" json:"field10350,omitempty"`
+	Field10351 *int32          `protobuf:"varint,5,opt,name=field10351" json:"field10351,omitempty"`
+	Field10352 *int32          `protobuf:"varint,6,opt,name=field10352" json:"field10352,omitempty"`
+	Field10353 *Enum10337      `protobuf:"varint,7,opt,name=field10353,enum=benchmarks.google_message4.Enum10337" json:"field10353,omitempty"`
 }
 
 func (x *Message10320) Reset() {
@@ -1992,9 +2007,10 @@ type Message11947 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11951    *uint32 `protobuf:"varint,1,opt,name=field11951" json:"field11951,omitempty"`
-	Field11952    *bool   `protobuf:"varint,2,opt,name=field11952" json:"field11952,omitempty"`
-	Field11953    *int32  `protobuf:"varint,3,opt,name=field11953" json:"field11953,omitempty"`
+
+	Field11951 *uint32 `protobuf:"varint,1,opt,name=field11951" json:"field11951,omitempty"`
+	Field11952 *bool   `protobuf:"varint,2,opt,name=field11952" json:"field11952,omitempty"`
+	Field11953 *int32  `protobuf:"varint,3,opt,name=field11953" json:"field11953,omitempty"`
 }
 
 func (x *Message11947) Reset() {
@@ -2049,8 +2065,9 @@ type Message11920 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field11945    *Enum11901  `protobuf:"varint,1,opt,name=field11945,enum=benchmarks.google_message4.Enum11901" json:"field11945,omitempty"`
-	Field11946    *UnusedEnum `protobuf:"varint,2,opt,name=field11946,enum=benchmarks.google_message4.UnusedEnum" json:"field11946,omitempty"`
+
+	Field11945 *Enum11901  `protobuf:"varint,1,opt,name=field11945,enum=benchmarks.google_message4.Enum11901" json:"field11945,omitempty"`
+	Field11946 *UnusedEnum `protobuf:"varint,2,opt,name=field11946,enum=benchmarks.google_message4.UnusedEnum" json:"field11946,omitempty"`
 }
 
 func (x *Message11920) Reset() {
@@ -2098,24 +2115,25 @@ type Message6643 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6683     *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field6683" json:"field6683,omitempty"`
-	Field6684     *UnusedEmptyMessage   `protobuf:"bytes,4,opt,name=field6684" json:"field6684,omitempty"`
-	Field6685     *float64              `protobuf:"fixed64,5,opt,name=field6685" json:"field6685,omitempty"`
-	Field6686     *float64              `protobuf:"fixed64,6,opt,name=field6686" json:"field6686,omitempty"`
-	Field6687     *int32                `protobuf:"varint,1,opt,name=field6687" json:"field6687,omitempty"`
-	Field6688     *int32                `protobuf:"varint,2,opt,name=field6688" json:"field6688,omitempty"`
-	Field6689     *float64              `protobuf:"fixed64,9,opt,name=field6689" json:"field6689,omitempty"`
-	Field6690     []byte                `protobuf:"bytes,10,opt,name=field6690" json:"field6690,omitempty"`
-	Field6691     *int32                `protobuf:"varint,11,opt,name=field6691" json:"field6691,omitempty"`
-	Field6692     *bool                 `protobuf:"varint,12,opt,name=field6692" json:"field6692,omitempty"`
-	Field6693     *bool                 `protobuf:"varint,13,opt,name=field6693" json:"field6693,omitempty"`
-	Field6694     *Message6578          `protobuf:"bytes,15,opt,name=field6694" json:"field6694,omitempty"`
-	Field6695     *UnusedEnum           `protobuf:"varint,16,opt,name=field6695,enum=benchmarks.google_message4.UnusedEnum" json:"field6695,omitempty"`
-	Field6696     *int64                `protobuf:"varint,17,opt,name=field6696" json:"field6696,omitempty"`
-	Field6697     []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field6697" json:"field6697,omitempty"`
-	Field6698     *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field6698" json:"field6698,omitempty"`
-	Field6699     *UnusedEmptyMessage   `protobuf:"bytes,20,opt,name=field6699" json:"field6699,omitempty"`
-	Field6700     *int32                `protobuf:"varint,21,opt,name=field6700" json:"field6700,omitempty"`
+
+	Field6683 *UnusedEmptyMessage   `protobuf:"bytes,3,opt,name=field6683" json:"field6683,omitempty"`
+	Field6684 *UnusedEmptyMessage   `protobuf:"bytes,4,opt,name=field6684" json:"field6684,omitempty"`
+	Field6685 *float64              `protobuf:"fixed64,5,opt,name=field6685" json:"field6685,omitempty"`
+	Field6686 *float64              `protobuf:"fixed64,6,opt,name=field6686" json:"field6686,omitempty"`
+	Field6687 *int32                `protobuf:"varint,1,opt,name=field6687" json:"field6687,omitempty"`
+	Field6688 *int32                `protobuf:"varint,2,opt,name=field6688" json:"field6688,omitempty"`
+	Field6689 *float64              `protobuf:"fixed64,9,opt,name=field6689" json:"field6689,omitempty"`
+	Field6690 []byte                `protobuf:"bytes,10,opt,name=field6690" json:"field6690,omitempty"`
+	Field6691 *int32                `protobuf:"varint,11,opt,name=field6691" json:"field6691,omitempty"`
+	Field6692 *bool                 `protobuf:"varint,12,opt,name=field6692" json:"field6692,omitempty"`
+	Field6693 *bool                 `protobuf:"varint,13,opt,name=field6693" json:"field6693,omitempty"`
+	Field6694 *Message6578          `protobuf:"bytes,15,opt,name=field6694" json:"field6694,omitempty"`
+	Field6695 *UnusedEnum           `protobuf:"varint,16,opt,name=field6695,enum=benchmarks.google_message4.UnusedEnum" json:"field6695,omitempty"`
+	Field6696 *int64                `protobuf:"varint,17,opt,name=field6696" json:"field6696,omitempty"`
+	Field6697 []*UnusedEmptyMessage `protobuf:"bytes,22,rep,name=field6697" json:"field6697,omitempty"`
+	Field6698 *UnusedEmptyMessage   `protobuf:"bytes,19,opt,name=field6698" json:"field6698,omitempty"`
+	Field6699 *UnusedEmptyMessage   `protobuf:"bytes,20,opt,name=field6699" json:"field6699,omitempty"`
+	Field6700 *int32                `protobuf:"varint,21,opt,name=field6700" json:"field6700,omitempty"`
 }
 
 func (x *Message6643) Reset() {
@@ -2275,26 +2293,27 @@ type Message6133 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6173     *Message4016   `protobuf:"bytes,12,opt,name=field6173" json:"field6173,omitempty"`
-	Field6174     *float64       `protobuf:"fixed64,16,opt,name=field6174" json:"field6174,omitempty"`
-	Field6175     *string        `protobuf:"bytes,1,req,name=field6175" json:"field6175,omitempty"`
-	Field6176     *string        `protobuf:"bytes,2,req,name=field6176" json:"field6176,omitempty"`
-	Field6177     *string        `protobuf:"bytes,3,req,name=field6177" json:"field6177,omitempty"`
-	Field6178     *string        `protobuf:"bytes,4,opt,name=field6178" json:"field6178,omitempty"`
-	Field6179     *string        `protobuf:"bytes,8,opt,name=field6179" json:"field6179,omitempty"`
-	Field6180     []*Message6109 `protobuf:"bytes,5,rep,name=field6180" json:"field6180,omitempty"`
-	Field6181     []*Message5908 `protobuf:"bytes,13,rep,name=field6181" json:"field6181,omitempty"`
-	Field6182     []*Message6107 `protobuf:"bytes,7,rep,name=field6182" json:"field6182,omitempty"`
-	Field6183     []*Message6126 `protobuf:"bytes,9,rep,name=field6183" json:"field6183,omitempty"`
-	Field6184     []*Message6129 `protobuf:"bytes,15,rep,name=field6184" json:"field6184,omitempty"`
-	Field6185     *int32         `protobuf:"varint,10,opt,name=field6185" json:"field6185,omitempty"`
-	Field6186     *int32         `protobuf:"varint,11,opt,name=field6186" json:"field6186,omitempty"`
-	Field6187     *Message4016   `protobuf:"bytes,17,opt,name=field6187" json:"field6187,omitempty"`
-	Field6188     *float64       `protobuf:"fixed64,14,opt,name=field6188" json:"field6188,omitempty"`
-	Field6189     *float64       `protobuf:"fixed64,18,opt,name=field6189" json:"field6189,omitempty"`
-	Field6190     *string        `protobuf:"bytes,19,opt,name=field6190" json:"field6190,omitempty"`
-	Field6191     *string        `protobuf:"bytes,20,opt,name=field6191" json:"field6191,omitempty"`
-	Field6192     []*Message5881 `protobuf:"bytes,21,rep,name=field6192" json:"field6192,omitempty"`
+
+	Field6173 *Message4016   `protobuf:"bytes,12,opt,name=field6173" json:"field6173,omitempty"`
+	Field6174 *float64       `protobuf:"fixed64,16,opt,name=field6174" json:"field6174,omitempty"`
+	Field6175 *string        `protobuf:"bytes,1,req,name=field6175" json:"field6175,omitempty"`
+	Field6176 *string        `protobuf:"bytes,2,req,name=field6176" json:"field6176,omitempty"`
+	Field6177 *string        `protobuf:"bytes,3,req,name=field6177" json:"field6177,omitempty"`
+	Field6178 *string        `protobuf:"bytes,4,opt,name=field6178" json:"field6178,omitempty"`
+	Field6179 *string        `protobuf:"bytes,8,opt,name=field6179" json:"field6179,omitempty"`
+	Field6180 []*Message6109 `protobuf:"bytes,5,rep,name=field6180" json:"field6180,omitempty"`
+	Field6181 []*Message5908 `protobuf:"bytes,13,rep,name=field6181" json:"field6181,omitempty"`
+	Field6182 []*Message6107 `protobuf:"bytes,7,rep,name=field6182" json:"field6182,omitempty"`
+	Field6183 []*Message6126 `protobuf:"bytes,9,rep,name=field6183" json:"field6183,omitempty"`
+	Field6184 []*Message6129 `protobuf:"bytes,15,rep,name=field6184" json:"field6184,omitempty"`
+	Field6185 *int32         `protobuf:"varint,10,opt,name=field6185" json:"field6185,omitempty"`
+	Field6186 *int32         `protobuf:"varint,11,opt,name=field6186" json:"field6186,omitempty"`
+	Field6187 *Message4016   `protobuf:"bytes,17,opt,name=field6187" json:"field6187,omitempty"`
+	Field6188 *float64       `protobuf:"fixed64,14,opt,name=field6188" json:"field6188,omitempty"`
+	Field6189 *float64       `protobuf:"fixed64,18,opt,name=field6189" json:"field6189,omitempty"`
+	Field6190 *string        `protobuf:"bytes,19,opt,name=field6190" json:"field6190,omitempty"`
+	Field6191 *string        `protobuf:"bytes,20,opt,name=field6191" json:"field6191,omitempty"`
+	Field6192 []*Message5881 `protobuf:"bytes,21,rep,name=field6192" json:"field6192,omitempty"`
 }
 
 func (x *Message6133) Reset() {
@@ -2469,18 +2488,19 @@ type Message6109 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
-	Field6140       *string        `protobuf:"bytes,1,opt,name=field6140" json:"field6140,omitempty"`
-	Field6141       *Enum6111      `protobuf:"varint,2,req,name=field6141,enum=benchmarks.google_message4.Enum6111" json:"field6141,omitempty"`
-	Field6142       *int32         `protobuf:"varint,9,opt,name=field6142" json:"field6142,omitempty"`
-	Field6143       *string        `protobuf:"bytes,3,opt,name=field6143" json:"field6143,omitempty"`
-	Field6144       []*Message6110 `protobuf:"bytes,4,rep,name=field6144" json:"field6144,omitempty"`
-	Field6145       []int32        `protobuf:"varint,7,rep,name=field6145" json:"field6145,omitempty"`
-	Field6146       []int32        `protobuf:"varint,8,rep,name=field6146" json:"field6146,omitempty"`
-	Field6147       *Message6133   `protobuf:"bytes,10,opt,name=field6147" json:"field6147,omitempty"`
-	Field6148       []int32        `protobuf:"varint,11,rep,name=field6148" json:"field6148,omitempty"`
-	Field6149       *string        `protobuf:"bytes,12,opt,name=field6149" json:"field6149,omitempty"`
-	Field6150       *string        `protobuf:"bytes,13,opt,name=field6150" json:"field6150,omitempty"`
-	Field6151       *bool          `protobuf:"varint,14,opt,name=field6151" json:"field6151,omitempty"`
+
+	Field6140 *string        `protobuf:"bytes,1,opt,name=field6140" json:"field6140,omitempty"`
+	Field6141 *Enum6111      `protobuf:"varint,2,req,name=field6141,enum=benchmarks.google_message4.Enum6111" json:"field6141,omitempty"`
+	Field6142 *int32         `protobuf:"varint,9,opt,name=field6142" json:"field6142,omitempty"`
+	Field6143 *string        `protobuf:"bytes,3,opt,name=field6143" json:"field6143,omitempty"`
+	Field6144 []*Message6110 `protobuf:"bytes,4,rep,name=field6144" json:"field6144,omitempty"`
+	Field6145 []int32        `protobuf:"varint,7,rep,name=field6145" json:"field6145,omitempty"`
+	Field6146 []int32        `protobuf:"varint,8,rep,name=field6146" json:"field6146,omitempty"`
+	Field6147 *Message6133   `protobuf:"bytes,10,opt,name=field6147" json:"field6147,omitempty"`
+	Field6148 []int32        `protobuf:"varint,11,rep,name=field6148" json:"field6148,omitempty"`
+	Field6149 *string        `protobuf:"bytes,12,opt,name=field6149" json:"field6149,omitempty"`
+	Field6150 *string        `protobuf:"bytes,13,opt,name=field6150" json:"field6150,omitempty"`
+	Field6151 *bool          `protobuf:"varint,14,opt,name=field6151" json:"field6151,omitempty"`
 }
 
 func (x *Message6109) Reset() {
@@ -2607,8 +2627,9 @@ type Message3046 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3222     *Enum2593 `protobuf:"varint,1,req,name=field3222,enum=benchmarks.google_message4.Enum2593" json:"field3222,omitempty"`
-	Field3223     *int32    `protobuf:"varint,4,opt,name=field3223" json:"field3223,omitempty"`
+
+	Field3222 *Enum2593 `protobuf:"varint,1,req,name=field3222,enum=benchmarks.google_message4.Enum2593" json:"field3222,omitempty"`
+	Field3223 *int32    `protobuf:"varint,4,opt,name=field3223" json:"field3223,omitempty"`
 }
 
 func (x *Message3046) Reset() {
@@ -2656,9 +2677,10 @@ type Message3060 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3283     *int64 `protobuf:"varint,1,opt,name=field3283" json:"field3283,omitempty"`
-	Field3284     *int64 `protobuf:"varint,2,opt,name=field3284" json:"field3284,omitempty"`
-	Field3285     *int64 `protobuf:"varint,3,opt,name=field3285" json:"field3285,omitempty"`
+
+	Field3283 *int64 `protobuf:"varint,1,opt,name=field3283" json:"field3283,omitempty"`
+	Field3284 *int64 `protobuf:"varint,2,opt,name=field3284" json:"field3284,omitempty"`
+	Field3285 *int64 `protobuf:"varint,3,opt,name=field3285" json:"field3285,omitempty"`
 }
 
 func (x *Message3060) Reset() {
@@ -2713,8 +2735,9 @@ type Message3041 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3214     *string `protobuf:"bytes,1,opt,name=field3214" json:"field3214,omitempty"`
-	Field3215     *int32  `protobuf:"varint,2,opt,name=field3215" json:"field3215,omitempty"`
+
+	Field3214 *string `protobuf:"bytes,1,opt,name=field3214" json:"field3214,omitempty"`
+	Field3215 *int32  `protobuf:"varint,2,opt,name=field3215" json:"field3215,omitempty"`
 }
 
 func (x *Message3041) Reset() {
@@ -2762,11 +2785,12 @@ type Message3040 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3209     *uint64  `protobuf:"fixed64,1,req,name=field3209" json:"field3209,omitempty"`
-	Field3210     []uint64 `protobuf:"fixed64,4,rep,name=field3210" json:"field3210,omitempty"`
-	Field3211     *int32   `protobuf:"varint,5,opt,name=field3211" json:"field3211,omitempty"`
-	Field3212     *uint64  `protobuf:"fixed64,2,opt,name=field3212" json:"field3212,omitempty"`
-	Field3213     *string  `protobuf:"bytes,3,req,name=field3213" json:"field3213,omitempty"`
+
+	Field3209 *uint64  `protobuf:"fixed64,1,req,name=field3209" json:"field3209,omitempty"`
+	Field3210 []uint64 `protobuf:"fixed64,4,rep,name=field3210" json:"field3210,omitempty"`
+	Field3211 *int32   `protobuf:"varint,5,opt,name=field3211" json:"field3211,omitempty"`
+	Field3212 *uint64  `protobuf:"fixed64,2,opt,name=field3212" json:"field3212,omitempty"`
+	Field3213 *string  `protobuf:"bytes,3,req,name=field3213" json:"field3213,omitempty"`
 }
 
 func (x *Message3040) Reset() {
@@ -2835,12 +2859,13 @@ type Message3050 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3245     []byte  `protobuf:"bytes,5,opt,name=field3245" json:"field3245,omitempty"`
-	Field3246     *int32  `protobuf:"varint,2,opt,name=field3246" json:"field3246,omitempty"`
-	Field3247     []byte  `protobuf:"bytes,6,opt,name=field3247" json:"field3247,omitempty"`
-	Field3248     *int32  `protobuf:"varint,4,opt,name=field3248" json:"field3248,omitempty"`
-	Field3249     *uint32 `protobuf:"fixed32,1,opt,name=field3249" json:"field3249,omitempty"`
-	Field3250     *uint32 `protobuf:"fixed32,3,opt,name=field3250" json:"field3250,omitempty"`
+
+	Field3245 []byte  `protobuf:"bytes,5,opt,name=field3245" json:"field3245,omitempty"`
+	Field3246 *int32  `protobuf:"varint,2,opt,name=field3246" json:"field3246,omitempty"`
+	Field3247 []byte  `protobuf:"bytes,6,opt,name=field3247" json:"field3247,omitempty"`
+	Field3248 *int32  `protobuf:"varint,4,opt,name=field3248" json:"field3248,omitempty"`
+	Field3249 *uint32 `protobuf:"fixed32,1,opt,name=field3249" json:"field3249,omitempty"`
+	Field3250 *uint32 `protobuf:"fixed32,3,opt,name=field3250" json:"field3250,omitempty"`
 }
 
 func (x *Message3050) Reset() {
@@ -2916,13 +2941,14 @@ type Message7905 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7911     *int32 `protobuf:"varint,1,opt,name=field7911" json:"field7911,omitempty"`
-	Field7912     *bool  `protobuf:"varint,2,opt,name=field7912" json:"field7912,omitempty"`
-	Field7913     []byte `protobuf:"bytes,3,opt,name=field7913" json:"field7913,omitempty"`
-	Field7914     *int32 `protobuf:"varint,4,opt,name=field7914" json:"field7914,omitempty"`
-	Field7915     *int32 `protobuf:"varint,5,opt,name=field7915" json:"field7915,omitempty"`
-	Field7916     []byte `protobuf:"bytes,6,opt,name=field7916" json:"field7916,omitempty"`
-	Field7917     *int32 `protobuf:"varint,7,opt,name=field7917" json:"field7917,omitempty"`
+
+	Field7911 *int32 `protobuf:"varint,1,opt,name=field7911" json:"field7911,omitempty"`
+	Field7912 *bool  `protobuf:"varint,2,opt,name=field7912" json:"field7912,omitempty"`
+	Field7913 []byte `protobuf:"bytes,3,opt,name=field7913" json:"field7913,omitempty"`
+	Field7914 *int32 `protobuf:"varint,4,opt,name=field7914" json:"field7914,omitempty"`
+	Field7915 *int32 `protobuf:"varint,5,opt,name=field7915" json:"field7915,omitempty"`
+	Field7916 []byte `protobuf:"bytes,6,opt,name=field7916" json:"field7916,omitempty"`
+	Field7917 *int32 `protobuf:"varint,7,opt,name=field7917" json:"field7917,omitempty"`
 }
 
 func (x *Message7905) Reset() {
@@ -3005,7 +3031,8 @@ type Message3886 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Message3887   []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
+
+	Message3887 []*Message3886_Message3887 `protobuf:"group,1,rep,name=Message3887,json=message3887" json:"message3887,omitempty"`
 }
 
 func (x *Message3886) Reset() {
@@ -3046,12 +3073,13 @@ type Message7864 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7866     *string               `protobuf:"bytes,1,opt,name=field7866" json:"field7866,omitempty"`
-	Field7867     *string               `protobuf:"bytes,2,opt,name=field7867" json:"field7867,omitempty"`
-	Field7868     []*Message7865        `protobuf:"bytes,5,rep,name=field7868" json:"field7868,omitempty"`
-	Field7869     []*Message7865        `protobuf:"bytes,6,rep,name=field7869" json:"field7869,omitempty"`
-	Field7870     []*Message7865        `protobuf:"bytes,7,rep,name=field7870" json:"field7870,omitempty"`
-	Field7871     []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field7871" json:"field7871,omitempty"`
+
+	Field7866 *string               `protobuf:"bytes,1,opt,name=field7866" json:"field7866,omitempty"`
+	Field7867 *string               `protobuf:"bytes,2,opt,name=field7867" json:"field7867,omitempty"`
+	Field7868 []*Message7865        `protobuf:"bytes,5,rep,name=field7868" json:"field7868,omitempty"`
+	Field7869 []*Message7865        `protobuf:"bytes,6,rep,name=field7869" json:"field7869,omitempty"`
+	Field7870 []*Message7865        `protobuf:"bytes,7,rep,name=field7870" json:"field7870,omitempty"`
+	Field7871 []*UnusedEmptyMessage `protobuf:"bytes,8,rep,name=field7871" json:"field7871,omitempty"`
 }
 
 func (x *Message7864) Reset() {
@@ -3127,7 +3155,8 @@ type Message3922 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field4012     *uint64 `protobuf:"varint,1,opt,name=field4012" json:"field4012,omitempty"`
+
+	Field4012 *uint64 `protobuf:"varint,1,opt,name=field4012" json:"field4012,omitempty"`
 }
 
 func (x *Message3922) Reset() {
@@ -3168,15 +3197,16 @@ type Message3052 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3254     []string `protobuf:"bytes,1,rep,name=field3254" json:"field3254,omitempty"`
-	Field3255     []string `protobuf:"bytes,2,rep,name=field3255" json:"field3255,omitempty"`
-	Field3256     [][]byte `protobuf:"bytes,3,rep,name=field3256" json:"field3256,omitempty"`
-	Field3257     []string `protobuf:"bytes,4,rep,name=field3257" json:"field3257,omitempty"`
-	Field3258     *bool    `protobuf:"varint,5,opt,name=field3258" json:"field3258,omitempty"`
-	Field3259     *int32   `protobuf:"varint,6,opt,name=field3259" json:"field3259,omitempty"`
-	Field3260     *int32   `protobuf:"varint,7,opt,name=field3260" json:"field3260,omitempty"`
-	Field3261     *string  `protobuf:"bytes,8,opt,name=field3261" json:"field3261,omitempty"`
-	Field3262     *string  `protobuf:"bytes,9,opt,name=field3262" json:"field3262,omitempty"`
+
+	Field3254 []string `protobuf:"bytes,1,rep,name=field3254" json:"field3254,omitempty"`
+	Field3255 []string `protobuf:"bytes,2,rep,name=field3255" json:"field3255,omitempty"`
+	Field3256 [][]byte `protobuf:"bytes,3,rep,name=field3256" json:"field3256,omitempty"`
+	Field3257 []string `protobuf:"bytes,4,rep,name=field3257" json:"field3257,omitempty"`
+	Field3258 *bool    `protobuf:"varint,5,opt,name=field3258" json:"field3258,omitempty"`
+	Field3259 *int32   `protobuf:"varint,6,opt,name=field3259" json:"field3259,omitempty"`
+	Field3260 *int32   `protobuf:"varint,7,opt,name=field3260" json:"field3260,omitempty"`
+	Field3261 *string  `protobuf:"bytes,8,opt,name=field3261" json:"field3261,omitempty"`
+	Field3262 *string  `protobuf:"bytes,9,opt,name=field3262" json:"field3262,omitempty"`
 }
 
 func (x *Message3052) Reset() {
@@ -3306,22 +3336,23 @@ type Message7843 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7844     *bool               `protobuf:"varint,5,opt,name=field7844" json:"field7844,omitempty"`
-	Field7845     *int32              `protobuf:"varint,1,opt,name=field7845" json:"field7845,omitempty"`
-	Field7846     *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field7846" json:"field7846,omitempty"`
-	Field7847     []int32             `protobuf:"varint,3,rep,name=field7847" json:"field7847,omitempty"`
-	Field7848     []string            `protobuf:"bytes,11,rep,name=field7848" json:"field7848,omitempty"`
-	Field7849     *UnusedEnum         `protobuf:"varint,15,opt,name=field7849,enum=benchmarks.google_message4.UnusedEnum" json:"field7849,omitempty"`
-	Field7850     *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field7850" json:"field7850,omitempty"`
-	Field7851     *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field7851" json:"field7851,omitempty"`
-	Field7852     *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field7852" json:"field7852,omitempty"`
-	Field7853     *Message7511        `protobuf:"bytes,13,opt,name=field7853" json:"field7853,omitempty"`
-	Field7854     *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field7854" json:"field7854,omitempty"`
-	Field7855     *UnusedEmptyMessage `protobuf:"bytes,17,opt,name=field7855" json:"field7855,omitempty"`
-	Field7856     *UnusedEmptyMessage `protobuf:"bytes,19,opt,name=field7856" json:"field7856,omitempty"`
-	Field7857     *UnusedEmptyMessage `protobuf:"bytes,18,opt,name=field7857" json:"field7857,omitempty"`
-	Field7858     *UnusedEnum         `protobuf:"varint,20,opt,name=field7858,enum=benchmarks.google_message4.UnusedEnum" json:"field7858,omitempty"`
-	Field7859     *int32              `protobuf:"varint,2,opt,name=field7859" json:"field7859,omitempty"`
+
+	Field7844 *bool               `protobuf:"varint,5,opt,name=field7844" json:"field7844,omitempty"`
+	Field7845 *int32              `protobuf:"varint,1,opt,name=field7845" json:"field7845,omitempty"`
+	Field7846 *UnusedEmptyMessage `protobuf:"bytes,22,opt,name=field7846" json:"field7846,omitempty"`
+	Field7847 []int32             `protobuf:"varint,3,rep,name=field7847" json:"field7847,omitempty"`
+	Field7848 []string            `protobuf:"bytes,11,rep,name=field7848" json:"field7848,omitempty"`
+	Field7849 *UnusedEnum         `protobuf:"varint,15,opt,name=field7849,enum=benchmarks.google_message4.UnusedEnum" json:"field7849,omitempty"`
+	Field7850 *UnusedEmptyMessage `protobuf:"bytes,6,opt,name=field7850" json:"field7850,omitempty"`
+	Field7851 *UnusedEmptyMessage `protobuf:"bytes,14,opt,name=field7851" json:"field7851,omitempty"`
+	Field7852 *UnusedEmptyMessage `protobuf:"bytes,10,opt,name=field7852" json:"field7852,omitempty"`
+	Field7853 *Message7511        `protobuf:"bytes,13,opt,name=field7853" json:"field7853,omitempty"`
+	Field7854 *UnusedEmptyMessage `protobuf:"bytes,16,opt,name=field7854" json:"field7854,omitempty"`
+	Field7855 *UnusedEmptyMessage `protobuf:"bytes,17,opt,name=field7855" json:"field7855,omitempty"`
+	Field7856 *UnusedEmptyMessage `protobuf:"bytes,19,opt,name=field7856" json:"field7856,omitempty"`
+	Field7857 *UnusedEmptyMessage `protobuf:"bytes,18,opt,name=field7857" json:"field7857,omitempty"`
+	Field7858 *UnusedEnum         `protobuf:"varint,20,opt,name=field7858,enum=benchmarks.google_message4.UnusedEnum" json:"field7858,omitempty"`
+	Field7859 *int32              `protobuf:"varint,2,opt,name=field7859" json:"field7859,omitempty"`
 }
 
 func (x *Message7843) Reset() {
@@ -3467,7 +3498,8 @@ type Message3919 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field4009     []*Message3920 `protobuf:"bytes,1,rep,name=field4009" json:"field4009,omitempty"`
+
+	Field4009 []*Message3920 `protobuf:"bytes,1,rep,name=field4009" json:"field4009,omitempty"`
 }
 
 func (x *Message3919) Reset() {
@@ -3508,26 +3540,27 @@ type Message7929 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7942     *int64                `protobuf:"varint,1,opt,name=field7942" json:"field7942,omitempty"`
-	Field7943     *int64                `protobuf:"varint,4,opt,name=field7943" json:"field7943,omitempty"`
-	Field7944     *int64                `protobuf:"varint,5,opt,name=field7944" json:"field7944,omitempty"`
-	Field7945     *int64                `protobuf:"varint,12,opt,name=field7945" json:"field7945,omitempty"`
-	Field7946     *int64                `protobuf:"varint,13,opt,name=field7946" json:"field7946,omitempty"`
-	Field7947     *int64                `protobuf:"varint,18,opt,name=field7947" json:"field7947,omitempty"`
-	Field7948     *int64                `protobuf:"varint,6,opt,name=field7948" json:"field7948,omitempty"`
-	Field7949     *int64                `protobuf:"varint,7,opt,name=field7949" json:"field7949,omitempty"`
-	Field7950     []*Message7919        `protobuf:"bytes,8,rep,name=field7950" json:"field7950,omitempty"`
-	Field7951     []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field7951" json:"field7951,omitempty"`
-	Field7952     []*Message7920        `protobuf:"bytes,14,rep,name=field7952" json:"field7952,omitempty"`
-	Field7953     []*Message7921        `protobuf:"bytes,15,rep,name=field7953" json:"field7953,omitempty"`
-	Field7954     []*Message7928        `protobuf:"bytes,17,rep,name=field7954" json:"field7954,omitempty"`
-	Field7955     *int64                `protobuf:"varint,19,opt,name=field7955" json:"field7955,omitempty"`
-	Field7956     *bool                 `protobuf:"varint,2,opt,name=field7956" json:"field7956,omitempty"`
-	Field7957     *int64                `protobuf:"varint,3,opt,name=field7957" json:"field7957,omitempty"`
-	Field7958     *int64                `protobuf:"varint,9,opt,name=field7958" json:"field7958,omitempty"`
-	Field7959     []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field7959" json:"field7959,omitempty"`
-	Field7960     [][]byte              `protobuf:"bytes,11,rep,name=field7960" json:"field7960,omitempty"`
-	Field7961     *int64                `protobuf:"varint,16,opt,name=field7961" json:"field7961,omitempty"`
+
+	Field7942 *int64                `protobuf:"varint,1,opt,name=field7942" json:"field7942,omitempty"`
+	Field7943 *int64                `protobuf:"varint,4,opt,name=field7943" json:"field7943,omitempty"`
+	Field7944 *int64                `protobuf:"varint,5,opt,name=field7944" json:"field7944,omitempty"`
+	Field7945 *int64                `protobuf:"varint,12,opt,name=field7945" json:"field7945,omitempty"`
+	Field7946 *int64                `protobuf:"varint,13,opt,name=field7946" json:"field7946,omitempty"`
+	Field7947 *int64                `protobuf:"varint,18,opt,name=field7947" json:"field7947,omitempty"`
+	Field7948 *int64                `protobuf:"varint,6,opt,name=field7948" json:"field7948,omitempty"`
+	Field7949 *int64                `protobuf:"varint,7,opt,name=field7949" json:"field7949,omitempty"`
+	Field7950 []*Message7919        `protobuf:"bytes,8,rep,name=field7950" json:"field7950,omitempty"`
+	Field7951 []*UnusedEmptyMessage `protobuf:"bytes,20,rep,name=field7951" json:"field7951,omitempty"`
+	Field7952 []*Message7920        `protobuf:"bytes,14,rep,name=field7952" json:"field7952,omitempty"`
+	Field7953 []*Message7921        `protobuf:"bytes,15,rep,name=field7953" json:"field7953,omitempty"`
+	Field7954 []*Message7928        `protobuf:"bytes,17,rep,name=field7954" json:"field7954,omitempty"`
+	Field7955 *int64                `protobuf:"varint,19,opt,name=field7955" json:"field7955,omitempty"`
+	Field7956 *bool                 `protobuf:"varint,2,opt,name=field7956" json:"field7956,omitempty"`
+	Field7957 *int64                `protobuf:"varint,3,opt,name=field7957" json:"field7957,omitempty"`
+	Field7958 *int64                `protobuf:"varint,9,opt,name=field7958" json:"field7958,omitempty"`
+	Field7959 []*UnusedEmptyMessage `protobuf:"bytes,10,rep,name=field7959" json:"field7959,omitempty"`
+	Field7960 [][]byte              `protobuf:"bytes,11,rep,name=field7960" json:"field7960,omitempty"`
+	Field7961 *int64                `protobuf:"varint,16,opt,name=field7961" json:"field7961,omitempty"`
 }
 
 func (x *Message7929) Reset() {
@@ -3701,9 +3734,10 @@ type Message3061_Message3062 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3335     *int32 `protobuf:"varint,5,req,name=field3335" json:"field3335,omitempty"`
-	Field3336     *int32 `protobuf:"varint,6,opt,name=field3336" json:"field3336,omitempty"`
-	Field3337     *int32 `protobuf:"varint,7,opt,name=field3337" json:"field3337,omitempty"`
+
+	Field3335 *int32 `protobuf:"varint,5,req,name=field3335" json:"field3335,omitempty"`
+	Field3336 *int32 `protobuf:"varint,6,opt,name=field3336" json:"field3336,omitempty"`
+	Field3337 *int32 `protobuf:"varint,7,opt,name=field3337" json:"field3337,omitempty"`
 }
 
 func (x *Message3061_Message3062) Reset() {
@@ -3758,10 +3792,11 @@ type Message3061_Message3063 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3338     *int32    `protobuf:"varint,14,req,name=field3338" json:"field3338,omitempty"`
-	Field3339     *Enum2851 `protobuf:"varint,18,opt,name=field3339,enum=benchmarks.google_message4.Enum2851" json:"field3339,omitempty"`
-	Field3340     *int64    `protobuf:"varint,15,opt,name=field3340" json:"field3340,omitempty"`
-	Field3341     *int64    `protobuf:"varint,23,opt,name=field3341" json:"field3341,omitempty"`
+
+	Field3338 *int32    `protobuf:"varint,14,req,name=field3338" json:"field3338,omitempty"`
+	Field3339 *Enum2851 `protobuf:"varint,18,opt,name=field3339,enum=benchmarks.google_message4.Enum2851" json:"field3339,omitempty"`
+	Field3340 *int64    `protobuf:"varint,15,opt,name=field3340" json:"field3340,omitempty"`
+	Field3341 *int64    `protobuf:"varint,23,opt,name=field3341" json:"field3341,omitempty"`
 }
 
 func (x *Message3061_Message3063) Reset() {
@@ -3823,25 +3858,26 @@ type Message3061_Message3064 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3342     *Enum2602           `protobuf:"varint,9,req,name=field3342,enum=benchmarks.google_message4.Enum2602" json:"field3342,omitempty"`
-	Field3343     *int32              `protobuf:"varint,92,opt,name=field3343" json:"field3343,omitempty"`
-	Field3344     *string             `protobuf:"bytes,10,opt,name=field3344" json:"field3344,omitempty"`
-	Field3345     []byte              `protobuf:"bytes,11,opt,name=field3345" json:"field3345,omitempty"`
-	Field3346     *int32              `protobuf:"varint,12,opt,name=field3346" json:"field3346,omitempty"`
-	Field3347     *Message3060        `protobuf:"bytes,98,opt,name=field3347" json:"field3347,omitempty"`
-	Field3348     *UnusedEmptyMessage `protobuf:"bytes,82,opt,name=field3348" json:"field3348,omitempty"`
-	Field3349     *Message3050        `protobuf:"bytes,80,opt,name=field3349" json:"field3349,omitempty"`
-	Field3350     *uint64             `protobuf:"fixed64,52,opt,name=field3350" json:"field3350,omitempty"`
-	Field3351     *int32              `protobuf:"varint,33,opt,name=field3351" json:"field3351,omitempty"`
-	Field3352     *string             `protobuf:"bytes,42,opt,name=field3352" json:"field3352,omitempty"`
-	Field3353     *string             `protobuf:"bytes,69,opt,name=field3353" json:"field3353,omitempty"`
-	Field3354     []byte              `protobuf:"bytes,43,opt,name=field3354" json:"field3354,omitempty"`
-	Field3355     *Enum2806           `protobuf:"varint,73,opt,name=field3355,enum=benchmarks.google_message4.Enum2806" json:"field3355,omitempty"`
-	Field3356     *int32              `protobuf:"varint,74,opt,name=field3356" json:"field3356,omitempty"`
-	Field3357     *int32              `protobuf:"varint,90,opt,name=field3357" json:"field3357,omitempty"`
-	Field3358     []byte              `protobuf:"bytes,79,opt,name=field3358" json:"field3358,omitempty"`
-	Field3359     *int32              `protobuf:"varint,19,opt,name=field3359" json:"field3359,omitempty"`
-	Field3360     *Enum2834           `protobuf:"varint,95,opt,name=field3360,enum=benchmarks.google_message4.Enum2834" json:"field3360,omitempty"`
+
+	Field3342 *Enum2602           `protobuf:"varint,9,req,name=field3342,enum=benchmarks.google_message4.Enum2602" json:"field3342,omitempty"`
+	Field3343 *int32              `protobuf:"varint,92,opt,name=field3343" json:"field3343,omitempty"`
+	Field3344 *string             `protobuf:"bytes,10,opt,name=field3344" json:"field3344,omitempty"`
+	Field3345 []byte              `protobuf:"bytes,11,opt,name=field3345" json:"field3345,omitempty"`
+	Field3346 *int32              `protobuf:"varint,12,opt,name=field3346" json:"field3346,omitempty"`
+	Field3347 *Message3060        `protobuf:"bytes,98,opt,name=field3347" json:"field3347,omitempty"`
+	Field3348 *UnusedEmptyMessage `protobuf:"bytes,82,opt,name=field3348" json:"field3348,omitempty"`
+	Field3349 *Message3050        `protobuf:"bytes,80,opt,name=field3349" json:"field3349,omitempty"`
+	Field3350 *uint64             `protobuf:"fixed64,52,opt,name=field3350" json:"field3350,omitempty"`
+	Field3351 *int32              `protobuf:"varint,33,opt,name=field3351" json:"field3351,omitempty"`
+	Field3352 *string             `protobuf:"bytes,42,opt,name=field3352" json:"field3352,omitempty"`
+	Field3353 *string             `protobuf:"bytes,69,opt,name=field3353" json:"field3353,omitempty"`
+	Field3354 []byte              `protobuf:"bytes,43,opt,name=field3354" json:"field3354,omitempty"`
+	Field3355 *Enum2806           `protobuf:"varint,73,opt,name=field3355,enum=benchmarks.google_message4.Enum2806" json:"field3355,omitempty"`
+	Field3356 *int32              `protobuf:"varint,74,opt,name=field3356" json:"field3356,omitempty"`
+	Field3357 *int32              `protobuf:"varint,90,opt,name=field3357" json:"field3357,omitempty"`
+	Field3358 []byte              `protobuf:"bytes,79,opt,name=field3358" json:"field3358,omitempty"`
+	Field3359 *int32              `protobuf:"varint,19,opt,name=field3359" json:"field3359,omitempty"`
+	Field3360 *Enum2834           `protobuf:"varint,95,opt,name=field3360,enum=benchmarks.google_message4.Enum2834" json:"field3360,omitempty"`
 }
 
 func (x *Message3061_Message3064) Reset() {
@@ -4041,14 +4077,15 @@ type Message3061_Message3066 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3366     *int32              `protobuf:"varint,22,opt,name=field3366" json:"field3366,omitempty"`
-	Field3367     *int32              `protobuf:"varint,55,opt,name=field3367" json:"field3367,omitempty"`
-	Field3368     *int32              `protobuf:"varint,88,opt,name=field3368" json:"field3368,omitempty"`
-	Field3369     *int32              `protobuf:"varint,56,opt,name=field3369" json:"field3369,omitempty"`
-	Field3370     *int32              `protobuf:"varint,75,opt,name=field3370" json:"field3370,omitempty"`
-	Field3371     *int32              `protobuf:"varint,57,opt,name=field3371" json:"field3371,omitempty"`
-	Field3372     *UnusedEmptyMessage `protobuf:"bytes,85,opt,name=field3372" json:"field3372,omitempty"`
-	Field3373     *UnusedEmptyMessage `protobuf:"bytes,96,opt,name=field3373" json:"field3373,omitempty"`
+
+	Field3366 *int32              `protobuf:"varint,22,opt,name=field3366" json:"field3366,omitempty"`
+	Field3367 *int32              `protobuf:"varint,55,opt,name=field3367" json:"field3367,omitempty"`
+	Field3368 *int32              `protobuf:"varint,88,opt,name=field3368" json:"field3368,omitempty"`
+	Field3369 *int32              `protobuf:"varint,56,opt,name=field3369" json:"field3369,omitempty"`
+	Field3370 *int32              `protobuf:"varint,75,opt,name=field3370" json:"field3370,omitempty"`
+	Field3371 *int32              `protobuf:"varint,57,opt,name=field3371" json:"field3371,omitempty"`
+	Field3372 *UnusedEmptyMessage `protobuf:"bytes,85,opt,name=field3372" json:"field3372,omitempty"`
+	Field3373 *UnusedEmptyMessage `protobuf:"bytes,96,opt,name=field3373" json:"field3373,omitempty"`
 }
 
 func (x *Message3061_Message3066) Reset() {
@@ -4138,10 +4175,11 @@ type Message3886_Message3887 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3932     *string      `protobuf:"bytes,2,req,name=field3932" json:"field3932,omitempty"`
-	Field3933     *string      `protobuf:"bytes,9,opt,name=field3933" json:"field3933,omitempty"`
-	Field3934     *Message3850 `protobuf:"bytes,3,opt,name=field3934" json:"field3934,omitempty"`
-	Field3935     []byte       `protobuf:"bytes,8,opt,name=field3935" json:"field3935,omitempty"`
+
+	Field3932 *string      `protobuf:"bytes,2,req,name=field3932" json:"field3932,omitempty"`
+	Field3933 *string      `protobuf:"bytes,9,opt,name=field3933" json:"field3933,omitempty"`
+	Field3934 *Message3850 `protobuf:"bytes,3,opt,name=field3934" json:"field3934,omitempty"`
+	Field3935 []byte       `protobuf:"bytes,8,opt,name=field3935" json:"field3935,omitempty"`
 }
 
 func (x *Message3886_Message3887) Reset() {

internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go

@@ -21,12 +21,13 @@ type Message12774 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12777    *uint32 `protobuf:"varint,1,opt,name=field12777" json:"field12777,omitempty"`
-	Field12778    *uint32 `protobuf:"varint,2,opt,name=field12778" json:"field12778,omitempty"`
-	Field12779    *uint32 `protobuf:"varint,3,opt,name=field12779" json:"field12779,omitempty"`
-	Field12780    *uint32 `protobuf:"varint,4,opt,name=field12780" json:"field12780,omitempty"`
-	Field12781    *uint32 `protobuf:"varint,5,opt,name=field12781" json:"field12781,omitempty"`
-	Field12782    *bool   `protobuf:"varint,6,opt,name=field12782" json:"field12782,omitempty"`
+
+	Field12777 *uint32 `protobuf:"varint,1,opt,name=field12777" json:"field12777,omitempty"`
+	Field12778 *uint32 `protobuf:"varint,2,opt,name=field12778" json:"field12778,omitempty"`
+	Field12779 *uint32 `protobuf:"varint,3,opt,name=field12779" json:"field12779,omitempty"`
+	Field12780 *uint32 `protobuf:"varint,4,opt,name=field12780" json:"field12780,omitempty"`
+	Field12781 *uint32 `protobuf:"varint,5,opt,name=field12781" json:"field12781,omitempty"`
+	Field12782 *bool   `protobuf:"varint,6,opt,name=field12782" json:"field12782,omitempty"`
 }
 
 func (x *Message12774) Reset() {
@@ -102,8 +103,9 @@ type Message12796 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12800    []uint64 `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
-	Field12801    *uint64  `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
+
+	Field12800 []uint64 `protobuf:"fixed64,1,rep,name=field12800" json:"field12800,omitempty"`
+	Field12801 *uint64  `protobuf:"varint,2,opt,name=field12801" json:"field12801,omitempty"`
 }
 
 func (x *Message12796) Reset() {
@@ -151,11 +153,12 @@ type Message12821 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12848    *int32 `protobuf:"varint,1,opt,name=field12848" json:"field12848,omitempty"`
-	Field12849    *int32 `protobuf:"varint,2,opt,name=field12849" json:"field12849,omitempty"`
-	Field12850    *int32 `protobuf:"varint,3,opt,name=field12850" json:"field12850,omitempty"`
-	Field12851    *int32 `protobuf:"varint,4,opt,name=field12851" json:"field12851,omitempty"`
-	Field12852    *int32 `protobuf:"varint,5,opt,name=field12852" json:"field12852,omitempty"`
+
+	Field12848 *int32 `protobuf:"varint,1,opt,name=field12848" json:"field12848,omitempty"`
+	Field12849 *int32 `protobuf:"varint,2,opt,name=field12849" json:"field12849,omitempty"`
+	Field12850 *int32 `protobuf:"varint,3,opt,name=field12850" json:"field12850,omitempty"`
+	Field12851 *int32 `protobuf:"varint,4,opt,name=field12851" json:"field12851,omitempty"`
+	Field12852 *int32 `protobuf:"varint,5,opt,name=field12852" json:"field12852,omitempty"`
 }
 
 func (x *Message12821) Reset() {
@@ -224,14 +227,15 @@ type Message12820 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12840    *int32 `protobuf:"varint,1,opt,name=field12840" json:"field12840,omitempty"`
-	Field12841    *int32 `protobuf:"varint,2,opt,name=field12841" json:"field12841,omitempty"`
-	Field12842    *int32 `protobuf:"varint,3,opt,name=field12842" json:"field12842,omitempty"`
-	Field12843    *int32 `protobuf:"varint,8,opt,name=field12843" json:"field12843,omitempty"`
-	Field12844    *int32 `protobuf:"varint,4,opt,name=field12844" json:"field12844,omitempty"`
-	Field12845    *int32 `protobuf:"varint,5,opt,name=field12845" json:"field12845,omitempty"`
-	Field12846    *int32 `protobuf:"varint,6,opt,name=field12846" json:"field12846,omitempty"`
-	Field12847    *int32 `protobuf:"varint,7,opt,name=field12847" json:"field12847,omitempty"`
+
+	Field12840 *int32 `protobuf:"varint,1,opt,name=field12840" json:"field12840,omitempty"`
+	Field12841 *int32 `protobuf:"varint,2,opt,name=field12841" json:"field12841,omitempty"`
+	Field12842 *int32 `protobuf:"varint,3,opt,name=field12842" json:"field12842,omitempty"`
+	Field12843 *int32 `protobuf:"varint,8,opt,name=field12843" json:"field12843,omitempty"`
+	Field12844 *int32 `protobuf:"varint,4,opt,name=field12844" json:"field12844,omitempty"`
+	Field12845 *int32 `protobuf:"varint,5,opt,name=field12845" json:"field12845,omitempty"`
+	Field12846 *int32 `protobuf:"varint,6,opt,name=field12846" json:"field12846,omitempty"`
+	Field12847 *int32 `protobuf:"varint,7,opt,name=field12847" json:"field12847,omitempty"`
 }
 
 func (x *Message12820) Reset() {
@@ -321,12 +325,13 @@ type Message12819 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12834    *float64 `protobuf:"fixed64,1,opt,name=field12834" json:"field12834,omitempty"`
-	Field12835    *float64 `protobuf:"fixed64,2,opt,name=field12835" json:"field12835,omitempty"`
-	Field12836    *float64 `protobuf:"fixed64,3,opt,name=field12836" json:"field12836,omitempty"`
-	Field12837    *float64 `protobuf:"fixed64,4,opt,name=field12837" json:"field12837,omitempty"`
-	Field12838    *float64 `protobuf:"fixed64,5,opt,name=field12838" json:"field12838,omitempty"`
-	Field12839    *float64 `protobuf:"fixed64,6,opt,name=field12839" json:"field12839,omitempty"`
+
+	Field12834 *float64 `protobuf:"fixed64,1,opt,name=field12834" json:"field12834,omitempty"`
+	Field12835 *float64 `protobuf:"fixed64,2,opt,name=field12835" json:"field12835,omitempty"`
+	Field12836 *float64 `protobuf:"fixed64,3,opt,name=field12836" json:"field12836,omitempty"`
+	Field12837 *float64 `protobuf:"fixed64,4,opt,name=field12837" json:"field12837,omitempty"`
+	Field12838 *float64 `protobuf:"fixed64,5,opt,name=field12838" json:"field12838,omitempty"`
+	Field12839 *float64 `protobuf:"fixed64,6,opt,name=field12839" json:"field12839,omitempty"`
 }
 
 func (x *Message12819) Reset() {
@@ -402,11 +407,12 @@ type Message12818 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12829    *uint64         `protobuf:"varint,1,opt,name=field12829" json:"field12829,omitempty"`
-	Field12830    *int32          `protobuf:"varint,2,opt,name=field12830" json:"field12830,omitempty"`
-	Field12831    *int32          `protobuf:"varint,3,opt,name=field12831" json:"field12831,omitempty"`
-	Field12832    *int32          `protobuf:"varint,5,opt,name=field12832" json:"field12832,omitempty"`
-	Field12833    []*Message12817 `protobuf:"bytes,4,rep,name=field12833" json:"field12833,omitempty"`
+
+	Field12829 *uint64         `protobuf:"varint,1,opt,name=field12829" json:"field12829,omitempty"`
+	Field12830 *int32          `protobuf:"varint,2,opt,name=field12830" json:"field12830,omitempty"`
+	Field12831 *int32          `protobuf:"varint,3,opt,name=field12831" json:"field12831,omitempty"`
+	Field12832 *int32          `protobuf:"varint,5,opt,name=field12832" json:"field12832,omitempty"`
+	Field12833 []*Message12817 `protobuf:"bytes,4,rep,name=field12833" json:"field12833,omitempty"`
 }
 
 func (x *Message12818) Reset() {
@@ -475,13 +481,14 @@ type Message10319 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field10340    *Enum10325 `protobuf:"varint,1,opt,name=field10340,enum=benchmarks.google_message4.Enum10325" json:"field10340,omitempty"`
-	Field10341    *int32     `protobuf:"varint,4,opt,name=field10341" json:"field10341,omitempty"`
-	Field10342    *int32     `protobuf:"varint,5,opt,name=field10342" json:"field10342,omitempty"`
-	Field10343    []byte     `protobuf:"bytes,3,opt,name=field10343" json:"field10343,omitempty"`
-	Field10344    *string    `protobuf:"bytes,2,opt,name=field10344" json:"field10344,omitempty"`
-	Field10345    *string    `protobuf:"bytes,6,opt,name=field10345" json:"field10345,omitempty"`
-	Field10346    *string    `protobuf:"bytes,7,opt,name=field10346" json:"field10346,omitempty"`
+
+	Field10340 *Enum10325 `protobuf:"varint,1,opt,name=field10340,enum=benchmarks.google_message4.Enum10325" json:"field10340,omitempty"`
+	Field10341 *int32     `protobuf:"varint,4,opt,name=field10341" json:"field10341,omitempty"`
+	Field10342 *int32     `protobuf:"varint,5,opt,name=field10342" json:"field10342,omitempty"`
+	Field10343 []byte     `protobuf:"bytes,3,opt,name=field10343" json:"field10343,omitempty"`
+	Field10344 *string    `protobuf:"bytes,2,opt,name=field10344" json:"field10344,omitempty"`
+	Field10345 *string    `protobuf:"bytes,6,opt,name=field10345" json:"field10345,omitempty"`
+	Field10346 *string    `protobuf:"bytes,7,opt,name=field10346" json:"field10346,omitempty"`
 }
 
 func (x *Message10319) Reset() {
@@ -564,8 +571,9 @@ type Message6578 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6632     *Enum6579 `protobuf:"varint,1,opt,name=field6632,enum=benchmarks.google_message4.Enum6579" json:"field6632,omitempty"`
-	Field6633     *Enum6588 `protobuf:"varint,2,opt,name=field6633,enum=benchmarks.google_message4.Enum6588" json:"field6633,omitempty"`
+
+	Field6632 *Enum6579 `protobuf:"varint,1,opt,name=field6632,enum=benchmarks.google_message4.Enum6579" json:"field6632,omitempty"`
+	Field6633 *Enum6588 `protobuf:"varint,2,opt,name=field6633,enum=benchmarks.google_message4.Enum6588" json:"field6633,omitempty"`
 }
 
 func (x *Message6578) Reset() {
@@ -613,25 +621,26 @@ type Message6126 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6152     *string               `protobuf:"bytes,1,req,name=field6152" json:"field6152,omitempty"`
-	Field6153     []*Message6127        `protobuf:"bytes,9,rep,name=field6153" json:"field6153,omitempty"`
-	Field6154     *int32                `protobuf:"varint,14,opt,name=field6154" json:"field6154,omitempty"`
-	Field6155     []byte                `protobuf:"bytes,10,opt,name=field6155" json:"field6155,omitempty"`
-	Field6156     *Message6024          `protobuf:"bytes,12,opt,name=field6156" json:"field6156,omitempty"`
-	Field6157     *int32                `protobuf:"varint,4,opt,name=field6157" json:"field6157,omitempty"`
-	Field6158     *string               `protobuf:"bytes,5,opt,name=field6158" json:"field6158,omitempty"`
-	Field6159     *int32                `protobuf:"varint,6,opt,name=field6159" json:"field6159,omitempty"`
-	Field6160     []int32               `protobuf:"varint,2,rep,name=field6160" json:"field6160,omitempty"`
-	Field6161     []int32               `protobuf:"varint,3,rep,name=field6161" json:"field6161,omitempty"`
-	Field6162     []*Message6052        `protobuf:"bytes,7,rep,name=field6162" json:"field6162,omitempty"`
-	Field6163     []*UnusedEmptyMessage `protobuf:"bytes,11,rep,name=field6163" json:"field6163,omitempty"`
-	Field6164     *Enum6065             `protobuf:"varint,15,opt,name=field6164,enum=benchmarks.google_message4.Enum6065" json:"field6164,omitempty"`
-	Field6165     []*Message6127        `protobuf:"bytes,8,rep,name=field6165" json:"field6165,omitempty"`
-	Field6166     *bool                 `protobuf:"varint,13,opt,name=field6166" json:"field6166,omitempty"`
-	Field6167     *bool                 `protobuf:"varint,16,opt,name=field6167" json:"field6167,omitempty"`
-	Field6168     *bool                 `protobuf:"varint,18,opt,name=field6168" json:"field6168,omitempty"`
-	Field6169     []*Message6054        `protobuf:"bytes,17,rep,name=field6169" json:"field6169,omitempty"`
-	Field6170     *int32                `protobuf:"varint,19,opt,name=field6170" json:"field6170,omitempty"`
+
+	Field6152 *string               `protobuf:"bytes,1,req,name=field6152" json:"field6152,omitempty"`
+	Field6153 []*Message6127        `protobuf:"bytes,9,rep,name=field6153" json:"field6153,omitempty"`
+	Field6154 *int32                `protobuf:"varint,14,opt,name=field6154" json:"field6154,omitempty"`
+	Field6155 []byte                `protobuf:"bytes,10,opt,name=field6155" json:"field6155,omitempty"`
+	Field6156 *Message6024          `protobuf:"bytes,12,opt,name=field6156" json:"field6156,omitempty"`
+	Field6157 *int32                `protobuf:"varint,4,opt,name=field6157" json:"field6157,omitempty"`
+	Field6158 *string               `protobuf:"bytes,5,opt,name=field6158" json:"field6158,omitempty"`
+	Field6159 *int32                `protobuf:"varint,6,opt,name=field6159" json:"field6159,omitempty"`
+	Field6160 []int32               `protobuf:"varint,2,rep,name=field6160" json:"field6160,omitempty"`
+	Field6161 []int32               `protobuf:"varint,3,rep,name=field6161" json:"field6161,omitempty"`
+	Field6162 []*Message6052        `protobuf:"bytes,7,rep,name=field6162" json:"field6162,omitempty"`
+	Field6163 []*UnusedEmptyMessage `protobuf:"bytes,11,rep,name=field6163" json:"field6163,omitempty"`
+	Field6164 *Enum6065             `protobuf:"varint,15,opt,name=field6164,enum=benchmarks.google_message4.Enum6065" json:"field6164,omitempty"`
+	Field6165 []*Message6127        `protobuf:"bytes,8,rep,name=field6165" json:"field6165,omitempty"`
+	Field6166 *bool                 `protobuf:"varint,13,opt,name=field6166" json:"field6166,omitempty"`
+	Field6167 *bool                 `protobuf:"varint,16,opt,name=field6167" json:"field6167,omitempty"`
+	Field6168 *bool                 `protobuf:"varint,18,opt,name=field6168" json:"field6168,omitempty"`
+	Field6169 []*Message6054        `protobuf:"bytes,17,rep,name=field6169" json:"field6169,omitempty"`
+	Field6170 *int32                `protobuf:"varint,19,opt,name=field6170" json:"field6170,omitempty"`
 }
 
 func (x *Message6126) Reset() {
@@ -798,12 +807,13 @@ type Message5881 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field5897     *float64            `protobuf:"fixed64,1,req,name=field5897" json:"field5897,omitempty"`
-	Field5898     *string             `protobuf:"bytes,5,opt,name=field5898" json:"field5898,omitempty"`
-	Field5899     *Message5861        `protobuf:"bytes,2,opt,name=field5899" json:"field5899,omitempty"`
-	Field5900     *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field5900" json:"field5900,omitempty"`
-	Field5901     *Message5867        `protobuf:"bytes,4,opt,name=field5901" json:"field5901,omitempty"`
-	Field5902     *Message5880        `protobuf:"bytes,6,opt,name=field5902" json:"field5902,omitempty"`
+
+	Field5897 *float64            `protobuf:"fixed64,1,req,name=field5897" json:"field5897,omitempty"`
+	Field5898 *string             `protobuf:"bytes,5,opt,name=field5898" json:"field5898,omitempty"`
+	Field5899 *Message5861        `protobuf:"bytes,2,opt,name=field5899" json:"field5899,omitempty"`
+	Field5900 *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field5900" json:"field5900,omitempty"`
+	Field5901 *Message5867        `protobuf:"bytes,4,opt,name=field5901" json:"field5901,omitempty"`
+	Field5902 *Message5880        `protobuf:"bytes,6,opt,name=field5902" json:"field5902,omitempty"`
 }
 
 func (x *Message5881) Reset() {
@@ -912,12 +922,13 @@ type Message6107 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6134     *Message4016   `protobuf:"bytes,1,opt,name=field6134" json:"field6134,omitempty"`
-	Field6135     *int32         `protobuf:"varint,2,opt,name=field6135" json:"field6135,omitempty"`
-	Field6136     *string        `protobuf:"bytes,3,opt,name=field6136" json:"field6136,omitempty"`
-	Field6137     []int32        `protobuf:"varint,4,rep,name=field6137" json:"field6137,omitempty"`
-	Field6138     *int32         `protobuf:"varint,5,opt,name=field6138" json:"field6138,omitempty"`
-	Field6139     []*Message6108 `protobuf:"bytes,6,rep,name=field6139" json:"field6139,omitempty"`
+
+	Field6134 *Message4016   `protobuf:"bytes,1,opt,name=field6134" json:"field6134,omitempty"`
+	Field6135 *int32         `protobuf:"varint,2,opt,name=field6135" json:"field6135,omitempty"`
+	Field6136 *string        `protobuf:"bytes,3,opt,name=field6136" json:"field6136,omitempty"`
+	Field6137 []int32        `protobuf:"varint,4,rep,name=field6137" json:"field6137,omitempty"`
+	Field6138 *int32         `protobuf:"varint,5,opt,name=field6138" json:"field6138,omitempty"`
+	Field6139 []*Message6108 `protobuf:"bytes,6,rep,name=field6139" json:"field6139,omitempty"`
 }
 
 func (x *Message6107) Reset() {
@@ -993,8 +1004,9 @@ type Message6129 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6171     *Enum6130 `protobuf:"varint,1,req,name=field6171,enum=benchmarks.google_message4.Enum6130" json:"field6171,omitempty"`
-	Field6172     *string   `protobuf:"bytes,2,req,name=field6172" json:"field6172,omitempty"`
+
+	Field6171 *Enum6130 `protobuf:"varint,1,req,name=field6171,enum=benchmarks.google_message4.Enum6130" json:"field6171,omitempty"`
+	Field6172 *string   `protobuf:"bytes,2,req,name=field6172" json:"field6172,omitempty"`
 }
 
 func (x *Message6129) Reset() {
@@ -1042,56 +1054,57 @@ type Message5908 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field5971     *string      `protobuf:"bytes,1,opt,name=field5971" json:"field5971,omitempty"`
-	Field5972     *int32       `protobuf:"varint,2,opt,name=field5972" json:"field5972,omitempty"`
-	Field5973     *int32       `protobuf:"varint,3,opt,name=field5973" json:"field5973,omitempty"`
-	Field5974     *Enum5909    `protobuf:"varint,45,opt,name=field5974,enum=benchmarks.google_message4.Enum5909" json:"field5974,omitempty"`
-	Field5975     *Enum5912    `protobuf:"varint,4,opt,name=field5975,enum=benchmarks.google_message4.Enum5912" json:"field5975,omitempty"`
-	Field5976     *uint32      `protobuf:"fixed32,50,opt,name=field5976" json:"field5976,omitempty"`
-	Field5977     *uint32      `protobuf:"fixed32,5,opt,name=field5977" json:"field5977,omitempty"`
-	Field5978     *uint32      `protobuf:"fixed32,6,opt,name=field5978" json:"field5978,omitempty"`
-	Field5979     *string      `protobuf:"bytes,7,opt,name=field5979" json:"field5979,omitempty"`
-	Field5980     *Enum5915    `protobuf:"varint,8,opt,name=field5980,enum=benchmarks.google_message4.Enum5915" json:"field5980,omitempty"`
-	Field5981     *Message5903 `protobuf:"bytes,9,opt,name=field5981" json:"field5981,omitempty"`
-	Field5982     *Message5903 `protobuf:"bytes,10,opt,name=field5982" json:"field5982,omitempty"`
-	Field5983     *Enum5920    `protobuf:"varint,11,opt,name=field5983,enum=benchmarks.google_message4.Enum5920" json:"field5983,omitempty"`
-	Field5984     *Enum5923    `protobuf:"varint,40,opt,name=field5984,enum=benchmarks.google_message4.Enum5923" json:"field5984,omitempty"`
-	Field5985     *Message5903 `protobuf:"bytes,41,opt,name=field5985" json:"field5985,omitempty"`
-	Field5986     *Message5903 `protobuf:"bytes,42,opt,name=field5986" json:"field5986,omitempty"`
-	Field5987     *Enum5928    `protobuf:"varint,47,opt,name=field5987,enum=benchmarks.google_message4.Enum5928" json:"field5987,omitempty"`
-	Field5988     *bool        `protobuf:"varint,48,opt,name=field5988" json:"field5988,omitempty"`
-	Field5989     []uint32     `protobuf:"fixed32,49,rep,name=field5989" json:"field5989,omitempty"`
-	Field5990     *string      `protobuf:"bytes,12,opt,name=field5990" json:"field5990,omitempty"`
-	Field5991     *Message5903 `protobuf:"bytes,13,opt,name=field5991" json:"field5991,omitempty"`
-	Field5992     *Message5903 `protobuf:"bytes,14,opt,name=field5992" json:"field5992,omitempty"`
-	Field5993     *Message5903 `protobuf:"bytes,15,opt,name=field5993" json:"field5993,omitempty"`
-	Field5994     *Message5903 `protobuf:"bytes,16,opt,name=field5994" json:"field5994,omitempty"`
-	Field5995     *Message5903 `protobuf:"bytes,32,opt,name=field5995" json:"field5995,omitempty"`
-	Field5996     *Message5903 `protobuf:"bytes,33,opt,name=field5996" json:"field5996,omitempty"`
-	Field5997     *Message5903 `protobuf:"bytes,34,opt,name=field5997" json:"field5997,omitempty"`
-	Field5998     *Message5903 `protobuf:"bytes,35,opt,name=field5998" json:"field5998,omitempty"`
-	Field5999     *Enum5931    `protobuf:"varint,17,opt,name=field5999,enum=benchmarks.google_message4.Enum5931" json:"field5999,omitempty"`
-	Field6000     *Enum5935    `protobuf:"varint,18,opt,name=field6000,enum=benchmarks.google_message4.Enum5935" json:"field6000,omitempty"`
-	Field6001     *Enum5939    `protobuf:"varint,36,opt,name=field6001,enum=benchmarks.google_message4.Enum5939" json:"field6001,omitempty"`
-	Field6002     *Enum5939    `protobuf:"varint,37,opt,name=field6002,enum=benchmarks.google_message4.Enum5939" json:"field6002,omitempty"`
-	Field6003     []int32      `protobuf:"varint,19,rep,name=field6003" json:"field6003,omitempty"`
-	Field6004     *uint32      `protobuf:"varint,20,opt,name=field6004" json:"field6004,omitempty"`
-	Field6005     *uint32      `protobuf:"varint,21,opt,name=field6005" json:"field6005,omitempty"`
-	Field6006     *uint32      `protobuf:"varint,22,opt,name=field6006" json:"field6006,omitempty"`
-	Field6007     *uint32      `protobuf:"varint,23,opt,name=field6007" json:"field6007,omitempty"`
-	Field6008     *Enum5946    `protobuf:"varint,24,opt,name=field6008,enum=benchmarks.google_message4.Enum5946" json:"field6008,omitempty"`
-	Field6009     *Enum5946    `protobuf:"varint,25,opt,name=field6009,enum=benchmarks.google_message4.Enum5946" json:"field6009,omitempty"`
-	Field6010     *Enum5946    `protobuf:"varint,26,opt,name=field6010,enum=benchmarks.google_message4.Enum5946" json:"field6010,omitempty"`
-	Field6011     *Enum5946    `protobuf:"varint,27,opt,name=field6011,enum=benchmarks.google_message4.Enum5946" json:"field6011,omitempty"`
-	Field6012     *uint32      `protobuf:"fixed32,28,opt,name=field6012" json:"field6012,omitempty"`
-	Field6013     *uint32      `protobuf:"fixed32,29,opt,name=field6013" json:"field6013,omitempty"`
-	Field6014     *uint32      `protobuf:"fixed32,30,opt,name=field6014" json:"field6014,omitempty"`
-	Field6015     *uint32      `protobuf:"fixed32,31,opt,name=field6015" json:"field6015,omitempty"`
-	Field6016     *int32       `protobuf:"varint,38,opt,name=field6016" json:"field6016,omitempty"`
-	Field6017     *float32     `protobuf:"fixed32,39,opt,name=field6017" json:"field6017,omitempty"`
-	Field6018     *Enum5957    `protobuf:"varint,43,opt,name=field6018,enum=benchmarks.google_message4.Enum5957" json:"field6018,omitempty"`
-	Field6019     *Message5907 `protobuf:"bytes,44,opt,name=field6019" json:"field6019,omitempty"`
-	Field6020     *Enum5962    `protobuf:"varint,46,opt,name=field6020,enum=benchmarks.google_message4.Enum5962" json:"field6020,omitempty"`
+
+	Field5971 *string      `protobuf:"bytes,1,opt,name=field5971" json:"field5971,omitempty"`
+	Field5972 *int32       `protobuf:"varint,2,opt,name=field5972" json:"field5972,omitempty"`
+	Field5973 *int32       `protobuf:"varint,3,opt,name=field5973" json:"field5973,omitempty"`
+	Field5974 *Enum5909    `protobuf:"varint,45,opt,name=field5974,enum=benchmarks.google_message4.Enum5909" json:"field5974,omitempty"`
+	Field5975 *Enum5912    `protobuf:"varint,4,opt,name=field5975,enum=benchmarks.google_message4.Enum5912" json:"field5975,omitempty"`
+	Field5976 *uint32      `protobuf:"fixed32,50,opt,name=field5976" json:"field5976,omitempty"`
+	Field5977 *uint32      `protobuf:"fixed32,5,opt,name=field5977" json:"field5977,omitempty"`
+	Field5978 *uint32      `protobuf:"fixed32,6,opt,name=field5978" json:"field5978,omitempty"`
+	Field5979 *string      `protobuf:"bytes,7,opt,name=field5979" json:"field5979,omitempty"`
+	Field5980 *Enum5915    `protobuf:"varint,8,opt,name=field5980,enum=benchmarks.google_message4.Enum5915" json:"field5980,omitempty"`
+	Field5981 *Message5903 `protobuf:"bytes,9,opt,name=field5981" json:"field5981,omitempty"`
+	Field5982 *Message5903 `protobuf:"bytes,10,opt,name=field5982" json:"field5982,omitempty"`
+	Field5983 *Enum5920    `protobuf:"varint,11,opt,name=field5983,enum=benchmarks.google_message4.Enum5920" json:"field5983,omitempty"`
+	Field5984 *Enum5923    `protobuf:"varint,40,opt,name=field5984,enum=benchmarks.google_message4.Enum5923" json:"field5984,omitempty"`
+	Field5985 *Message5903 `protobuf:"bytes,41,opt,name=field5985" json:"field5985,omitempty"`
+	Field5986 *Message5903 `protobuf:"bytes,42,opt,name=field5986" json:"field5986,omitempty"`
+	Field5987 *Enum5928    `protobuf:"varint,47,opt,name=field5987,enum=benchmarks.google_message4.Enum5928" json:"field5987,omitempty"`
+	Field5988 *bool        `protobuf:"varint,48,opt,name=field5988" json:"field5988,omitempty"`
+	Field5989 []uint32     `protobuf:"fixed32,49,rep,name=field5989" json:"field5989,omitempty"`
+	Field5990 *string      `protobuf:"bytes,12,opt,name=field5990" json:"field5990,omitempty"`
+	Field5991 *Message5903 `protobuf:"bytes,13,opt,name=field5991" json:"field5991,omitempty"`
+	Field5992 *Message5903 `protobuf:"bytes,14,opt,name=field5992" json:"field5992,omitempty"`
+	Field5993 *Message5903 `protobuf:"bytes,15,opt,name=field5993" json:"field5993,omitempty"`
+	Field5994 *Message5903 `protobuf:"bytes,16,opt,name=field5994" json:"field5994,omitempty"`
+	Field5995 *Message5903 `protobuf:"bytes,32,opt,name=field5995" json:"field5995,omitempty"`
+	Field5996 *Message5903 `protobuf:"bytes,33,opt,name=field5996" json:"field5996,omitempty"`
+	Field5997 *Message5903 `protobuf:"bytes,34,opt,name=field5997" json:"field5997,omitempty"`
+	Field5998 *Message5903 `protobuf:"bytes,35,opt,name=field5998" json:"field5998,omitempty"`
+	Field5999 *Enum5931    `protobuf:"varint,17,opt,name=field5999,enum=benchmarks.google_message4.Enum5931" json:"field5999,omitempty"`
+	Field6000 *Enum5935    `protobuf:"varint,18,opt,name=field6000,enum=benchmarks.google_message4.Enum5935" json:"field6000,omitempty"`
+	Field6001 *Enum5939    `protobuf:"varint,36,opt,name=field6001,enum=benchmarks.google_message4.Enum5939" json:"field6001,omitempty"`
+	Field6002 *Enum5939    `protobuf:"varint,37,opt,name=field6002,enum=benchmarks.google_message4.Enum5939" json:"field6002,omitempty"`
+	Field6003 []int32      `protobuf:"varint,19,rep,name=field6003" json:"field6003,omitempty"`
+	Field6004 *uint32      `protobuf:"varint,20,opt,name=field6004" json:"field6004,omitempty"`
+	Field6005 *uint32      `protobuf:"varint,21,opt,name=field6005" json:"field6005,omitempty"`
+	Field6006 *uint32      `protobuf:"varint,22,opt,name=field6006" json:"field6006,omitempty"`
+	Field6007 *uint32      `protobuf:"varint,23,opt,name=field6007" json:"field6007,omitempty"`
+	Field6008 *Enum5946    `protobuf:"varint,24,opt,name=field6008,enum=benchmarks.google_message4.Enum5946" json:"field6008,omitempty"`
+	Field6009 *Enum5946    `protobuf:"varint,25,opt,name=field6009,enum=benchmarks.google_message4.Enum5946" json:"field6009,omitempty"`
+	Field6010 *Enum5946    `protobuf:"varint,26,opt,name=field6010,enum=benchmarks.google_message4.Enum5946" json:"field6010,omitempty"`
+	Field6011 *Enum5946    `protobuf:"varint,27,opt,name=field6011,enum=benchmarks.google_message4.Enum5946" json:"field6011,omitempty"`
+	Field6012 *uint32      `protobuf:"fixed32,28,opt,name=field6012" json:"field6012,omitempty"`
+	Field6013 *uint32      `protobuf:"fixed32,29,opt,name=field6013" json:"field6013,omitempty"`
+	Field6014 *uint32      `protobuf:"fixed32,30,opt,name=field6014" json:"field6014,omitempty"`
+	Field6015 *uint32      `protobuf:"fixed32,31,opt,name=field6015" json:"field6015,omitempty"`
+	Field6016 *int32       `protobuf:"varint,38,opt,name=field6016" json:"field6016,omitempty"`
+	Field6017 *float32     `protobuf:"fixed32,39,opt,name=field6017" json:"field6017,omitempty"`
+	Field6018 *Enum5957    `protobuf:"varint,43,opt,name=field6018,enum=benchmarks.google_message4.Enum5957" json:"field6018,omitempty"`
+	Field6019 *Message5907 `protobuf:"bytes,44,opt,name=field6019" json:"field6019,omitempty"`
+	Field6020 *Enum5962    `protobuf:"varint,46,opt,name=field6020,enum=benchmarks.google_message4.Enum5962" json:"field6020,omitempty"`
 }
 
 func (x *Message5908) Reset() {
@@ -1475,12 +1488,13 @@ type Message3850 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field3924     *Enum3851 `protobuf:"varint,2,opt,name=field3924,enum=benchmarks.google_message4.Enum3851" json:"field3924,omitempty"`
-	Field3925     *bool     `protobuf:"varint,12,opt,name=field3925" json:"field3925,omitempty"`
-	Field3926     *int32    `protobuf:"varint,4,opt,name=field3926" json:"field3926,omitempty"`
-	Field3927     *bool     `protobuf:"varint,10,opt,name=field3927" json:"field3927,omitempty"`
-	Field3928     *bool     `protobuf:"varint,13,opt,name=field3928" json:"field3928,omitempty"`
-	Field3929     *bool     `protobuf:"varint,14,opt,name=field3929" json:"field3929,omitempty"`
+
+	Field3924 *Enum3851 `protobuf:"varint,2,opt,name=field3924,enum=benchmarks.google_message4.Enum3851" json:"field3924,omitempty"`
+	Field3925 *bool     `protobuf:"varint,12,opt,name=field3925" json:"field3925,omitempty"`
+	Field3926 *int32    `protobuf:"varint,4,opt,name=field3926" json:"field3926,omitempty"`
+	Field3927 *bool     `protobuf:"varint,10,opt,name=field3927" json:"field3927,omitempty"`
+	Field3928 *bool     `protobuf:"varint,13,opt,name=field3928" json:"field3928,omitempty"`
+	Field3929 *bool     `protobuf:"varint,14,opt,name=field3929" json:"field3929,omitempty"`
 }
 
 func (x *Message3850) Reset() {
@@ -1589,13 +1603,14 @@ type Message7511 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7523     *bool     `protobuf:"varint,1,opt,name=field7523" json:"field7523,omitempty"`
-	Field7524     *Enum7512 `protobuf:"varint,2,opt,name=field7524,enum=benchmarks.google_message4.Enum7512" json:"field7524,omitempty"`
-	Field7525     *int32    `protobuf:"varint,3,opt,name=field7525" json:"field7525,omitempty"`
-	Field7526     *int32    `protobuf:"varint,4,opt,name=field7526" json:"field7526,omitempty"`
-	Field7527     *bool     `protobuf:"varint,5,opt,name=field7527" json:"field7527,omitempty"`
-	Field7528     *int32    `protobuf:"varint,6,opt,name=field7528" json:"field7528,omitempty"`
-	Field7529     *int32    `protobuf:"varint,7,opt,name=field7529" json:"field7529,omitempty"`
+
+	Field7523 *bool     `protobuf:"varint,1,opt,name=field7523" json:"field7523,omitempty"`
+	Field7524 *Enum7512 `protobuf:"varint,2,opt,name=field7524,enum=benchmarks.google_message4.Enum7512" json:"field7524,omitempty"`
+	Field7525 *int32    `protobuf:"varint,3,opt,name=field7525" json:"field7525,omitempty"`
+	Field7526 *int32    `protobuf:"varint,4,opt,name=field7526" json:"field7526,omitempty"`
+	Field7527 *bool     `protobuf:"varint,5,opt,name=field7527" json:"field7527,omitempty"`
+	Field7528 *int32    `protobuf:"varint,6,opt,name=field7528" json:"field7528,omitempty"`
+	Field7529 *int32    `protobuf:"varint,7,opt,name=field7529" json:"field7529,omitempty"`
 }
 
 func (x *Message7511) Reset() {
@@ -1711,8 +1726,9 @@ type Message7928 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7940     *string `protobuf:"bytes,1,opt,name=field7940" json:"field7940,omitempty"`
-	Field7941     *int64  `protobuf:"varint,2,opt,name=field7941" json:"field7941,omitempty"`
+
+	Field7940 *string `protobuf:"bytes,1,opt,name=field7940" json:"field7940,omitempty"`
+	Field7941 *int64  `protobuf:"varint,2,opt,name=field7941" json:"field7941,omitempty"`
 }
 
 func (x *Message7928) Reset() {
@@ -1760,10 +1776,11 @@ type Message7921 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7936     *int32    `protobuf:"varint,1,opt,name=field7936" json:"field7936,omitempty"`
-	Field7937     *int64    `protobuf:"varint,2,opt,name=field7937" json:"field7937,omitempty"`
-	Field7938     *float32  `protobuf:"fixed32,3,opt,name=field7938" json:"field7938,omitempty"`
-	Field7939     *Enum7922 `protobuf:"varint,4,opt,name=field7939,enum=benchmarks.google_message4.Enum7922" json:"field7939,omitempty"`
+
+	Field7936 *int32    `protobuf:"varint,1,opt,name=field7936" json:"field7936,omitempty"`
+	Field7937 *int64    `protobuf:"varint,2,opt,name=field7937" json:"field7937,omitempty"`
+	Field7938 *float32  `protobuf:"fixed32,3,opt,name=field7938" json:"field7938,omitempty"`
+	Field7939 *Enum7922 `protobuf:"varint,4,opt,name=field7939,enum=benchmarks.google_message4.Enum7922" json:"field7939,omitempty"`
 }
 
 func (x *Message7921) Reset() {
@@ -1825,8 +1842,9 @@ type Message7920 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7934     *int64 `protobuf:"varint,1,opt,name=field7934" json:"field7934,omitempty"`
-	Field7935     *int64 `protobuf:"varint,2,opt,name=field7935" json:"field7935,omitempty"`
+
+	Field7934 *int64 `protobuf:"varint,1,opt,name=field7934" json:"field7934,omitempty"`
+	Field7935 *int64 `protobuf:"varint,2,opt,name=field7935" json:"field7935,omitempty"`
 }
 
 func (x *Message7920) Reset() {
@@ -1874,9 +1892,10 @@ type Message7919 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field7931     *uint64 `protobuf:"fixed64,1,opt,name=field7931" json:"field7931,omitempty"`
-	Field7932     *int64  `protobuf:"varint,2,opt,name=field7932" json:"field7932,omitempty"`
-	Field7933     []byte  `protobuf:"bytes,3,opt,name=field7933" json:"field7933,omitempty"`
+
+	Field7931 *uint64 `protobuf:"fixed64,1,opt,name=field7931" json:"field7931,omitempty"`
+	Field7932 *int64  `protobuf:"varint,2,opt,name=field7932" json:"field7932,omitempty"`
+	Field7933 []byte  `protobuf:"bytes,3,opt,name=field7933" json:"field7933,omitempty"`
 }
 
 func (x *Message7919) Reset() {
@@ -1931,9 +1950,10 @@ type Message12817 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field12826    *int32 `protobuf:"varint,1,opt,name=field12826" json:"field12826,omitempty"`
-	Field12827    *int32 `protobuf:"varint,2,opt,name=field12827" json:"field12827,omitempty"`
-	Field12828    *int32 `protobuf:"varint,3,opt,name=field12828" json:"field12828,omitempty"`
+
+	Field12826 *int32 `protobuf:"varint,1,opt,name=field12826" json:"field12826,omitempty"`
+	Field12827 *int32 `protobuf:"varint,2,opt,name=field12827" json:"field12827,omitempty"`
+	Field12828 *int32 `protobuf:"varint,3,opt,name=field12828" json:"field12828,omitempty"`
 }
 
 func (x *Message12817) Reset() {
@@ -1988,8 +2008,9 @@ type Message6054 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6089     *string `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
-	Field6090     *string `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
+
+	Field6089 *string `protobuf:"bytes,1,req,name=field6089" json:"field6089,omitempty"`
+	Field6090 *string `protobuf:"bytes,2,opt,name=field6090" json:"field6090,omitempty"`
 }
 
 func (x *Message6054) Reset() {
@@ -2070,8 +2091,9 @@ type Message6052 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6084     *string `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
-	Field6085     []byte  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
+
+	Field6084 *string `protobuf:"bytes,1,req,name=field6084" json:"field6084,omitempty"`
+	Field6085 []byte  `protobuf:"bytes,2,req,name=field6085" json:"field6085,omitempty"`
 }
 
 func (x *Message6052) Reset() {
@@ -2119,9 +2141,10 @@ type Message6024 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field6048     *Enum6025           `protobuf:"varint,1,opt,name=field6048,enum=benchmarks.google_message4.Enum6025" json:"field6048,omitempty"`
-	Field6049     *string             `protobuf:"bytes,2,opt,name=field6049" json:"field6049,omitempty"`
-	Field6050     *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field6050" json:"field6050,omitempty"`
+
+	Field6048 *Enum6025           `protobuf:"varint,1,opt,name=field6048,enum=benchmarks.google_message4.Enum6025" json:"field6048,omitempty"`
+	Field6049 *string             `protobuf:"bytes,2,opt,name=field6049" json:"field6049,omitempty"`
+	Field6050 *UnusedEmptyMessage `protobuf:"bytes,3,opt,name=field6050" json:"field6050,omitempty"`
 }
 
 func (x *Message6024) Reset() {
@@ -2176,10 +2199,11 @@ type Message5861 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field5882     *Enum5862 `protobuf:"varint,1,req,name=field5882,enum=benchmarks.google_message4.Enum5862" json:"field5882,omitempty"`
-	Field5883     *string   `protobuf:"bytes,2,req,name=field5883" json:"field5883,omitempty"`
-	Field5884     *bool     `protobuf:"varint,3,opt,name=field5884" json:"field5884,omitempty"`
-	Field5885     *string   `protobuf:"bytes,4,opt,name=field5885" json:"field5885,omitempty"`
+
+	Field5882 *Enum5862 `protobuf:"varint,1,req,name=field5882,enum=benchmarks.google_message4.Enum5862" json:"field5882,omitempty"`
+	Field5883 *string   `protobuf:"bytes,2,req,name=field5883" json:"field5883,omitempty"`
+	Field5884 *bool     `protobuf:"varint,3,opt,name=field5884" json:"field5884,omitempty"`
+	Field5885 *string   `protobuf:"bytes,4,opt,name=field5885" json:"field5885,omitempty"`
 }
 
 func (x *Message5861) Reset() {
@@ -2241,7 +2265,8 @@ type Message5880 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field5896     *string `protobuf:"bytes,1,opt,name=field5896" json:"field5896,omitempty"`
+
+	Field5896 *string `protobuf:"bytes,1,opt,name=field5896" json:"field5896,omitempty"`
 }
 
 func (x *Message5880) Reset() {
@@ -2282,12 +2307,13 @@ type Message5867 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field5890     *Enum5868   `protobuf:"varint,1,opt,name=field5890,enum=benchmarks.google_message4.Enum5868" json:"field5890,omitempty"`
-	Field5891     *string     `protobuf:"bytes,2,opt,name=field5891" json:"field5891,omitempty"`
-	Field5892     *Enum5873   `protobuf:"varint,3,opt,name=field5892,enum=benchmarks.google_message4.Enum5873" json:"field5892,omitempty"`
-	Field5893     *int32      `protobuf:"varint,4,opt,name=field5893" json:"field5893,omitempty"`
-	Field5894     *UnusedEnum `protobuf:"varint,5,opt,name=field5894,enum=benchmarks.google_message4.UnusedEnum" json:"field5894,omitempty"`
-	Field5895     *bool       `protobuf:"varint,6,opt,name=field5895" json:"field5895,omitempty"`
+
+	Field5890 *Enum5868   `protobuf:"varint,1,opt,name=field5890,enum=benchmarks.google_message4.Enum5868" json:"field5890,omitempty"`
+	Field5891 *string     `protobuf:"bytes,2,opt,name=field5891" json:"field5891,omitempty"`
+	Field5892 *Enum5873   `protobuf:"varint,3,opt,name=field5892,enum=benchmarks.google_message4.Enum5873" json:"field5892,omitempty"`
+	Field5893 *int32      `protobuf:"varint,4,opt,name=field5893" json:"field5893,omitempty"`
+	Field5894 *UnusedEnum `protobuf:"varint,5,opt,name=field5894,enum=benchmarks.google_message4.UnusedEnum" json:"field5894,omitempty"`
+	Field5895 *bool       `protobuf:"varint,6,opt,name=field5895" json:"field5895,omitempty"`
 }
 
 func (x *Message5867) Reset() {
@@ -2363,10 +2389,11 @@ type Message4016 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field4017     *int32 `protobuf:"varint,1,req,name=field4017" json:"field4017,omitempty"`
-	Field4018     *int32 `protobuf:"varint,2,req,name=field4018" json:"field4018,omitempty"`
-	Field4019     *int32 `protobuf:"varint,3,req,name=field4019" json:"field4019,omitempty"`
-	Field4020     *int32 `protobuf:"varint,4,req,name=field4020" json:"field4020,omitempty"`
+
+	Field4017 *int32 `protobuf:"varint,1,req,name=field4017" json:"field4017,omitempty"`
+	Field4018 *int32 `protobuf:"varint,2,req,name=field4018" json:"field4018,omitempty"`
+	Field4019 *int32 `protobuf:"varint,3,req,name=field4019" json:"field4019,omitempty"`
+	Field4020 *int32 `protobuf:"varint,4,req,name=field4020" json:"field4020,omitempty"`
 }
 
 func (x *Message4016) Reset() {
@@ -2461,10 +2488,11 @@ type Message5907 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field5967     *Message5903 `protobuf:"bytes,1,opt,name=field5967" json:"field5967,omitempty"`
-	Field5968     *Message5903 `protobuf:"bytes,2,opt,name=field5968" json:"field5968,omitempty"`
-	Field5969     *Message5903 `protobuf:"bytes,3,opt,name=field5969" json:"field5969,omitempty"`
-	Field5970     *Message5903 `protobuf:"bytes,4,opt,name=field5970" json:"field5970,omitempty"`
+
+	Field5967 *Message5903 `protobuf:"bytes,1,opt,name=field5967" json:"field5967,omitempty"`
+	Field5968 *Message5903 `protobuf:"bytes,2,opt,name=field5968" json:"field5968,omitempty"`
+	Field5969 *Message5903 `protobuf:"bytes,3,opt,name=field5969" json:"field5969,omitempty"`
+	Field5970 *Message5903 `protobuf:"bytes,4,opt,name=field5970" json:"field5970,omitempty"`
 }
 
 func (x *Message5907) Reset() {
@@ -2559,8 +2587,9 @@ type Message5903 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Field5965     *int32    `protobuf:"varint,1,req,name=field5965" json:"field5965,omitempty"`
-	Field5966     *Enum5904 `protobuf:"varint,2,opt,name=field5966,enum=benchmarks.google_message4.Enum5904" json:"field5966,omitempty"`
+
+	Field5965 *int32    `protobuf:"varint,1,req,name=field5965" json:"field5965,omitempty"`
+	Field5966 *Enum5904 `protobuf:"varint,2,opt,name=field5966,enum=benchmarks.google_message4.Enum5904" json:"field5966,omitempty"`
 }
 
 func (x *Message5903) Reset() {

internal/testprotos/conformance/conformance.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: conformance/conformance.proto
 
@@ -24,7 +54,7 @@ const (
 	WireFormat_UNSPECIFIED WireFormat = 0
 	WireFormat_PROTOBUF    WireFormat = 1
 	WireFormat_JSON        WireFormat = 2
-	WireFormat_JSPB        WireFormat = 3
+	WireFormat_JSPB        WireFormat = 3 // Google internal only. Opensource testees just skip it.
 	WireFormat_TEXT_FORMAT WireFormat = 4
 )
 
@@ -77,8 +107,8 @@ type TestCategory int32
 
 const (
 	TestCategory_UNSPECIFIED_TEST TestCategory = 0
-	TestCategory_BINARY_TEST      TestCategory = 1
-	TestCategory_JSON_TEST        TestCategory = 2
+	TestCategory_BINARY_TEST      TestCategory = 1 // Test binary wire format.
+	TestCategory_JSON_TEST        TestCategory = 2 // Test json wire format.
 	// Similar to JSON_TEST. However, during parsing json, testee should ignore
 	// unknown fields. This feature is optional. Each implementation can descide
 	// whether to support it.  See
@@ -146,7 +176,8 @@ type FailureSet struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Failure       []string `protobuf:"bytes,1,rep,name=failure,proto3" json:"failure,omitempty"`
+
+	Failure []string `protobuf:"bytes,1,rep,name=failure,proto3" json:"failure,omitempty"`
 }
 
 func (x *FailureSet) Reset() {
@@ -192,6 +223,7 @@ type ConformanceRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The payload (whether protobuf of JSON) is always for a
 	// protobuf_test_messages.proto3.TestAllTypes proto (as defined in
 	// src/google/protobuf/proto3_test_messages.proto).
@@ -200,10 +232,9 @@ type ConformanceRequest struct {
 	// we will want to include a field that lets the payload/response be a
 	// protobuf_test_messages.proto2.TestAllTypes message instead.
 	//
-	// Types that are valid to be assigned to Payload:
+	// Types that are assignable to Payload:
 	//	*ConformanceRequest_ProtobufPayload
 	//	*ConformanceRequest_JsonPayload
-	// Google internal only.  Opensource testees just skip it.
 	//	*ConformanceRequest_JspbPayload
 	//	*ConformanceRequest_TextPayload
 	Payload isConformanceRequest_Payload `protobuf_oneof:"payload"`
@@ -324,6 +355,7 @@ type ConformanceRequest_JsonPayload struct {
 }
 
 type ConformanceRequest_JspbPayload struct {
+	// Google internal only.  Opensource testees just skip it.
 	JspbPayload string `protobuf:"bytes,7,opt,name=jspb_payload,json=jspbPayload,proto3,oneof"`
 }
 
@@ -344,36 +376,15 @@ type ConformanceResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	// Types that are valid to be assigned to Result:
-	// This string should be set to indicate parsing failed.  The string can
-	// provide more information about the parse error if it is available.
-	//
-	// Setting this string does not necessarily mean the testee failed the
-	// test.  Some of the test cases are intentionally invalid input.
+
+	// Types that are assignable to Result:
 	//	*ConformanceResponse_ParseError
-	// If the input was successfully parsed but errors occurred when
-	// serializing it to the requested output format, set the error message in
-	// this field.
 	//	*ConformanceResponse_SerializeError
-	// This should be set if some other error occurred.  This will always
-	// indicate that the test failed.  The string can provide more information
-	// about the failure.
 	//	*ConformanceResponse_RuntimeError
-	// If the input was successfully parsed and the requested output was
-	// protobuf, serialize it to protobuf and set it in this field.
 	//	*ConformanceResponse_ProtobufPayload
-	// If the input was successfully parsed and the requested output was JSON,
-	// serialize to JSON and set it in this field.
 	//	*ConformanceResponse_JsonPayload
-	// For when the testee skipped the test, likely because a certain feature
-	// wasn't supported, like JSON input/output.
 	//	*ConformanceResponse_Skipped
-	// If the input was successfully parsed and the requested output was JSPB,
-	// serialize to JSPB and set it in this field. JSPB is google internal only
-	// format. Opensource testees can just skip it.
 	//	*ConformanceResponse_JspbPayload
-	// If the input was successfully parsed and the requested output was
-	// TEXT_FORMAT, serialize to TEXT_FORMAT and set it in this field.
 	//	*ConformanceResponse_TextPayload
 	Result isConformanceResponse_Result `protobuf_oneof:"result"`
 }
@@ -473,34 +484,56 @@ type isConformanceResponse_Result interface {
 }
 
 type ConformanceResponse_ParseError struct {
+	// This string should be set to indicate parsing failed.  The string can
+	// provide more information about the parse error if it is available.
+	//
+	// Setting this string does not necessarily mean the testee failed the
+	// test.  Some of the test cases are intentionally invalid input.
 	ParseError string `protobuf:"bytes,1,opt,name=parse_error,json=parseError,proto3,oneof"`
 }
 
 type ConformanceResponse_SerializeError struct {
+	// If the input was successfully parsed but errors occurred when
+	// serializing it to the requested output format, set the error message in
+	// this field.
 	SerializeError string `protobuf:"bytes,6,opt,name=serialize_error,json=serializeError,proto3,oneof"`
 }
 
 type ConformanceResponse_RuntimeError struct {
+	// This should be set if some other error occurred.  This will always
+	// indicate that the test failed.  The string can provide more information
+	// about the failure.
 	RuntimeError string `protobuf:"bytes,2,opt,name=runtime_error,json=runtimeError,proto3,oneof"`
 }
 
 type ConformanceResponse_ProtobufPayload struct {
+	// If the input was successfully parsed and the requested output was
+	// protobuf, serialize it to protobuf and set it in this field.
 	ProtobufPayload []byte `protobuf:"bytes,3,opt,name=protobuf_payload,json=protobufPayload,proto3,oneof"`
 }
 
 type ConformanceResponse_JsonPayload struct {
+	// If the input was successfully parsed and the requested output was JSON,
+	// serialize to JSON and set it in this field.
 	JsonPayload string `protobuf:"bytes,4,opt,name=json_payload,json=jsonPayload,proto3,oneof"`
 }
 
 type ConformanceResponse_Skipped struct {
+	// For when the testee skipped the test, likely because a certain feature
+	// wasn't supported, like JSON input/output.
 	Skipped string `protobuf:"bytes,5,opt,name=skipped,proto3,oneof"`
 }
 
 type ConformanceResponse_JspbPayload struct {
+	// If the input was successfully parsed and the requested output was JSPB,
+	// serialize to JSPB and set it in this field. JSPB is google internal only
+	// format. Opensource testees can just skip it.
 	JspbPayload string `protobuf:"bytes,7,opt,name=jspb_payload,json=jspbPayload,proto3,oneof"`
 }
 
 type ConformanceResponse_TextPayload struct {
+	// If the input was successfully parsed and the requested output was
+	// TEXT_FORMAT, serialize to TEXT_FORMAT and set it in this field.
 	TextPayload string `protobuf:"bytes,8,opt,name=text_payload,json=textPayload,proto3,oneof"`
 }
 
@@ -525,6 +558,7 @@ type JspbEncodingConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Encode the value field of Any as jspb array if ture, otherwise binary.
 	UseJspbArrayAnyFormat bool `protobuf:"varint,1,opt,name=use_jspb_array_any_format,json=useJspbArrayAnyFormat,proto3" json:"use_jspb_array_any_format,omitempty"`
 }

internal/testprotos/conformance/test_messages_proto2.pb.go

@@ -1,3 +1,38 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Test schema for proto2 messages.  This test schema is used by:
+//
+// - conformance tests
+//
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/test_messages_proto2.proto
 
@@ -84,7 +119,7 @@ const (
 	TestAllTypesProto2_FOO TestAllTypesProto2_NestedEnum = 0
 	TestAllTypesProto2_BAR TestAllTypesProto2_NestedEnum = 1
 	TestAllTypesProto2_BAZ TestAllTypesProto2_NestedEnum = 2
-	TestAllTypesProto2_NEG TestAllTypesProto2_NestedEnum = -1
+	TestAllTypesProto2_NEG TestAllTypesProto2_NestedEnum = -1 // Intentionally negative.
 )
 
 // Enum value maps for TestAllTypesProto2_NestedEnum.
@@ -152,6 +187,7 @@ type TestAllTypesProto2 struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// Singular
 	OptionalInt32          *int32                            `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
 	OptionalInt64          *int64                            `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
@@ -217,7 +253,7 @@ type TestAllTypesProto2 struct {
 	MapStringForeignMessage map[string]*ForeignMessageProto2             `protobuf:"bytes,72,rep,name=map_string_foreign_message,json=mapStringForeignMessage" json:"map_string_foreign_message,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	MapStringNestedEnum     map[string]TestAllTypesProto2_NestedEnum     `protobuf:"bytes,73,rep,name=map_string_nested_enum,json=mapStringNestedEnum" json:"map_string_nested_enum,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=protobuf_test_messages.proto2.TestAllTypesProto2_NestedEnum"`
 	MapStringForeignEnum    map[string]ForeignEnumProto2                 `protobuf:"bytes,74,rep,name=map_string_foreign_enum,json=mapStringForeignEnum" json:"map_string_foreign_enum,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=protobuf_test_messages.proto2.ForeignEnumProto2"`
-	// Types that are valid to be assigned to OneofField:
+	// Types that are assignable to OneofField:
 	//	*TestAllTypesProto2_OneofUint32
 	//	*TestAllTypesProto2_OneofNestedMessage
 	//	*TestAllTypesProto2_OneofString
@@ -986,7 +1022,8 @@ type ForeignMessageProto2 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	C             *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+
+	C *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
 }
 
 func (x *ForeignMessageProto2) Reset() {
@@ -1027,8 +1064,9 @@ type TestAllTypesProto2_NestedMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32              `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	Corecursive   *TestAllTypesProto2 `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
+
+	A           *int32              `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	Corecursive *TestAllTypesProto2 `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
 }
 
 func (x *TestAllTypesProto2_NestedMessage) Reset() {
@@ -1077,8 +1115,9 @@ type TestAllTypesProto2_Data struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	GroupInt32    *int32  `protobuf:"varint,202,opt,name=group_int32,json=groupInt32" json:"group_int32,omitempty"`
-	GroupUint32   *uint32 `protobuf:"varint,203,opt,name=group_uint32,json=groupUint32" json:"group_uint32,omitempty"`
+
+	GroupInt32  *int32  `protobuf:"varint,202,opt,name=group_int32,json=groupInt32" json:"group_int32,omitempty"`
+	GroupUint32 *uint32 `protobuf:"varint,203,opt,name=group_uint32,json=groupUint32" json:"group_uint32,omitempty"`
 }
 
 func (x *TestAllTypesProto2_Data) Reset() {
@@ -1170,7 +1209,8 @@ type TestAllTypesProto2_MessageSetCorrectExtension1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Str           *string `protobuf:"bytes,25,opt,name=str" json:"str,omitempty"`
+
+	Str *string `protobuf:"bytes,25,opt,name=str" json:"str,omitempty"`
 }
 
 func (x *TestAllTypesProto2_MessageSetCorrectExtension1) Reset() {
@@ -1211,7 +1251,8 @@ type TestAllTypesProto2_MessageSetCorrectExtension2 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	I             *int32 `protobuf:"varint,9,opt,name=i" json:"i,omitempty"`
+
+	I *int32 `protobuf:"varint,9,opt,name=i" json:"i,omitempty"`
 }
 
 func (x *TestAllTypesProto2_MessageSetCorrectExtension2) Reset() {

internal/testprotos/conformance/test_messages_proto3.pb.go

@@ -1,3 +1,40 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Test schema for proto3 messages.  This test schema is used by:
+//
+// - benchmarks
+// - fuzz tests
+// - conformance tests
+//
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/test_messages_proto3.proto
 
@@ -79,7 +116,7 @@ const (
 	TestAllTypesProto3_FOO TestAllTypesProto3_NestedEnum = 0
 	TestAllTypesProto3_BAR TestAllTypesProto3_NestedEnum = 1
 	TestAllTypesProto3_BAZ TestAllTypesProto3_NestedEnum = 2
-	TestAllTypesProto3_NEG TestAllTypesProto3_NestedEnum = -1
+	TestAllTypesProto3_NEG TestAllTypesProto3_NestedEnum = -1 // Intentionally negative.
 )
 
 // Enum value maps for TestAllTypesProto3_NestedEnum.
@@ -194,6 +231,7 @@ type TestAllTypesProto3 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Singular
 	OptionalInt32          int32                             `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`
 	OptionalInt64          int64                             `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64,proto3" json:"optional_int64,omitempty"`
@@ -260,7 +298,7 @@ type TestAllTypesProto3 struct {
 	MapStringForeignMessage map[string]*ForeignMessage                   `protobuf:"bytes,72,rep,name=map_string_foreign_message,json=mapStringForeignMessage,proto3" json:"map_string_foreign_message,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	MapStringNestedEnum     map[string]TestAllTypesProto3_NestedEnum     `protobuf:"bytes,73,rep,name=map_string_nested_enum,json=mapStringNestedEnum,proto3" json:"map_string_nested_enum,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=protobuf_test_messages.proto3.TestAllTypesProto3_NestedEnum"`
 	MapStringForeignEnum    map[string]ForeignEnum                       `protobuf:"bytes,74,rep,name=map_string_foreign_enum,json=mapStringForeignEnum,proto3" json:"map_string_foreign_enum,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=protobuf_test_messages.proto3.ForeignEnum"`
-	// Types that are valid to be assigned to OneofField:
+	// Types that are assignable to OneofField:
 	//	*TestAllTypesProto3_OneofUint32
 	//	*TestAllTypesProto3_OneofNestedMessage
 	//	*TestAllTypesProto3_OneofString
@@ -1268,7 +1306,8 @@ type ForeignMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	C             int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
+
+	C int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
 }
 
 func (x *ForeignMessage) Reset() {
@@ -1309,8 +1348,9 @@ type TestAllTypesProto3_NestedMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             int32               `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
-	Corecursive   *TestAllTypesProto3 `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
+
+	A           int32               `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
+	Corecursive *TestAllTypesProto3 `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
 }
 
 func (x *TestAllTypesProto3_NestedMessage) Reset() {

internal/testprotos/irregular/test.pb.go

@@ -1,3 +1,11 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// This file contains a message which references a message that implements the
+// proto.Message interface but does not have the structure of a normal generated
+// message.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: irregular/test.proto
 
@@ -18,14 +26,15 @@ const (
 )
 
 type Message struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	OptionalMessage *IrregularMessage            `protobuf:"bytes,1,opt,name=optional_message,json=optionalMessage" json:"optional_message,omitempty"`
 	RepeatedMessage []*IrregularMessage          `protobuf:"bytes,2,rep,name=repeated_message,json=repeatedMessage" json:"repeated_message,omitempty"`
 	RequiredMessage *IrregularMessage            `protobuf:"bytes,3,req,name=required_message,json=requiredMessage" json:"required_message,omitempty"`
 	MapMessage      map[string]*IrregularMessage `protobuf:"bytes,4,rep,name=map_message,json=mapMessage" json:"map_message,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Types that are valid to be assigned to Union:
+	// Types that are assignable to Union:
 	//	*Message_OneofMessage
 	Union isMessage_Union `protobuf_oneof:"union"`
 }

internal/testprotos/legacy/legacy.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: legacy/legacy.proto
 
@@ -33,18 +37,19 @@ type Legacy struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	F1            *proto2_v0_0.Message  `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
-	F2            *proto3_v0_0.Message  `protobuf:"bytes,2,opt,name=f2,proto3" json:"f2,omitempty"`
-	F3            *proto2_v0_01.Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
-	F4            *proto3_v0_01.Message `protobuf:"bytes,4,opt,name=f4,proto3" json:"f4,omitempty"`
-	F5            *proto2_v1_0.Message  `protobuf:"bytes,5,opt,name=f5,proto3" json:"f5,omitempty"`
-	F6            *proto3_v1_0.Message  `protobuf:"bytes,6,opt,name=f6,proto3" json:"f6,omitempty"`
-	F7            *proto2_v1_1.Message  `protobuf:"bytes,7,opt,name=f7,proto3" json:"f7,omitempty"`
-	F8            *proto3_v1_1.Message  `protobuf:"bytes,8,opt,name=f8,proto3" json:"f8,omitempty"`
-	F9            *proto2_v1_2.Message  `protobuf:"bytes,9,opt,name=f9,proto3" json:"f9,omitempty"`
-	F10           *proto3_v1_2.Message  `protobuf:"bytes,10,opt,name=f10,proto3" json:"f10,omitempty"`
-	F11           *proto2_v1_21.Message `protobuf:"bytes,11,opt,name=f11,proto3" json:"f11,omitempty"`
-	F12           *proto3_v1_21.Message `protobuf:"bytes,12,opt,name=f12,proto3" json:"f12,omitempty"`
+
+	F1  *proto2_v0_0.Message  `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"`
+	F2  *proto3_v0_0.Message  `protobuf:"bytes,2,opt,name=f2,proto3" json:"f2,omitempty"`
+	F3  *proto2_v0_01.Message `protobuf:"bytes,3,opt,name=f3,proto3" json:"f3,omitempty"`
+	F4  *proto3_v0_01.Message `protobuf:"bytes,4,opt,name=f4,proto3" json:"f4,omitempty"`
+	F5  *proto2_v1_0.Message  `protobuf:"bytes,5,opt,name=f5,proto3" json:"f5,omitempty"`
+	F6  *proto3_v1_0.Message  `protobuf:"bytes,6,opt,name=f6,proto3" json:"f6,omitempty"`
+	F7  *proto2_v1_1.Message  `protobuf:"bytes,7,opt,name=f7,proto3" json:"f7,omitempty"`
+	F8  *proto3_v1_1.Message  `protobuf:"bytes,8,opt,name=f8,proto3" json:"f8,omitempty"`
+	F9  *proto2_v1_2.Message  `protobuf:"bytes,9,opt,name=f9,proto3" json:"f9,omitempty"`
+	F10 *proto3_v1_2.Message  `protobuf:"bytes,10,opt,name=f10,proto3" json:"f10,omitempty"`
+	F11 *proto2_v1_21.Message `protobuf:"bytes,11,opt,name=f11,proto3" json:"f11,omitempty"`
+	F12 *proto3_v1_21.Message `protobuf:"bytes,12,opt,name=f12,proto3" json:"f12,omitempty"`
 }
 
 func (x *Legacy) Reset() {

internal/testprotos/messageset/messagesetpb/message_set.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: messageset/messagesetpb/message_set.proto
 

internal/testprotos/messageset/msetextpb/msetextpb.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: messageset/msetextpb/msetextpb.proto
 
@@ -23,8 +27,9 @@ type Ext1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Ext1Field1    *int32 `protobuf:"varint,1,opt,name=ext1_field1,json=ext1Field1" json:"ext1_field1,omitempty"`
-	Ext1Field2    *int32 `protobuf:"varint,2,opt,name=ext1_field2,json=ext1Field2" json:"ext1_field2,omitempty"`
+
+	Ext1Field1 *int32 `protobuf:"varint,1,opt,name=ext1_field1,json=ext1Field1" json:"ext1_field1,omitempty"`
+	Ext1Field2 *int32 `protobuf:"varint,2,opt,name=ext1_field2,json=ext1Field2" json:"ext1_field2,omitempty"`
 }
 
 func (x *Ext1) Reset() {
@@ -72,7 +77,8 @@ type Ext2 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Ext2Field1    *int32 `protobuf:"varint,1,opt,name=ext2_field1,json=ext2Field1" json:"ext2_field1,omitempty"`
+
+	Ext2Field1 *int32 `protobuf:"varint,1,opt,name=ext2_field1,json=ext2Field1" json:"ext2_field1,omitempty"`
 }
 
 func (x *Ext2) Reset() {

internal/testprotos/test/ext.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test/ext.proto
 

internal/testprotos/test/test.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test/test.proto
 
@@ -137,7 +141,7 @@ const (
 	TestAllTypes_FOO TestAllTypes_NestedEnum = 0
 	TestAllTypes_BAR TestAllTypes_NestedEnum = 1
 	TestAllTypes_BAZ TestAllTypes_NestedEnum = 2
-	TestAllTypes_NEG TestAllTypes_NestedEnum = -1
+	TestAllTypes_NEG TestAllTypes_NestedEnum = -1 // Intentionally negative.
 )
 
 // Enum value maps for TestAllTypes_NestedEnum.
@@ -193,9 +197,12 @@ func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_test_test_proto_rawDescGZIP(), []int{0, 0}
 }
 
-type TestDeprecatedMessage_DeprecatedEnum int32 // Deprecated: Do not use.
+// Deprecated: Do not use.
+type TestDeprecatedMessage_DeprecatedEnum int32
+
 const (
-	TestDeprecatedMessage_DEPRECATED TestDeprecatedMessage_DeprecatedEnum = 0 // Deprecated: Do not use.
+	// Deprecated: Do not use.
+	TestDeprecatedMessage_DEPRECATED TestDeprecatedMessage_DeprecatedEnum = 0
 )
 
 // Enum value maps for TestDeprecatedMessage_DeprecatedEnum.
@@ -246,9 +253,10 @@ func (TestDeprecatedMessage_DeprecatedEnum) EnumDescriptor() ([]byte, []int) {
 }
 
 type TestAllTypes struct {
-	state                  protoimpl.MessageState
-	sizeCache              protoimpl.SizeCache
-	unknownFields          protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	OptionalInt32          *int32                                 `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
 	OptionalInt64          *int64                                 `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
 	OptionalUint32         *uint32                                `protobuf:"varint,3,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
@@ -328,7 +336,7 @@ type TestAllTypes struct {
 	DefaultBytes       []byte                   `protobuf:"bytes,95,opt,name=default_bytes,json=defaultBytes,def=world" json:"default_bytes,omitempty"`
 	DefaultNestedEnum  *TestAllTypes_NestedEnum `protobuf:"varint,96,opt,name=default_nested_enum,json=defaultNestedEnum,enum=goproto.proto.test.TestAllTypes_NestedEnum,def=1" json:"default_nested_enum,omitempty"`
 	DefaultForeignEnum *ForeignEnum             `protobuf:"varint,97,opt,name=default_foreign_enum,json=defaultForeignEnum,enum=goproto.proto.test.ForeignEnum,def=5" json:"default_foreign_enum,omitempty"`
-	// Types that are valid to be assigned to OneofField:
+	// Types that are assignable to OneofField:
 	//	*TestAllTypes_OneofUint32
 	//	*TestAllTypes_OneofNestedMessage
 	//	*TestAllTypes_OneofString
@@ -1069,11 +1077,13 @@ func (*TestAllTypes_OneofEnum) isTestAllTypes_OneofField() {}
 
 // Deprecated: Do not use.
 type TestDeprecatedMessage struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
-	DeprecatedInt32 *int32 `protobuf:"varint,1,opt,name=deprecated_int32,json=deprecatedInt32" json:"deprecated_int32,omitempty"` // Deprecated: Do not use.
-	// Types that are valid to be assigned to DeprecatedOneof:
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Deprecated: Do not use.
+	DeprecatedInt32 *int32 `protobuf:"varint,1,opt,name=deprecated_int32,json=deprecatedInt32" json:"deprecated_int32,omitempty"`
+	// Types that are assignable to DeprecatedOneof:
 	//	*TestDeprecatedMessage_DeprecatedOneofField
 	DeprecatedOneof isTestDeprecatedMessage_DeprecatedOneof `protobuf_oneof:"deprecated_oneof"`
 }
@@ -1133,6 +1143,7 @@ type isTestDeprecatedMessage_DeprecatedOneof interface {
 }
 
 type TestDeprecatedMessage_DeprecatedOneofField struct {
+	// Deprecated: Do not use.
 	DeprecatedOneofField int32 `protobuf:"varint,2,opt,name=deprecated_oneof_field,json=deprecatedOneofField,oneof"`
 }
 
@@ -1142,8 +1153,9 @@ type ForeignMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	C             *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
-	D             *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"`
+
+	C *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+	D *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"`
 }
 
 func (x *ForeignMessage) Reset() {
@@ -1267,7 +1279,8 @@ type OptionalGroupExtension struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
+
+	A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *OptionalGroupExtension) Reset() {
@@ -1308,7 +1321,8 @@ type RepeatedGroupExtension struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
+
+	A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *RepeatedGroupExtension) Reset() {
@@ -1382,6 +1396,7 @@ type TestRequired struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"`
 }
 
@@ -1420,13 +1435,14 @@ func (x *TestRequired) GetRequiredField() int32 {
 }
 
 type TestRequiredForeign struct {
-	state           protoimpl.MessageState
-	sizeCache       protoimpl.SizeCache
-	unknownFields   protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	OptionalMessage *TestRequired           `protobuf:"bytes,1,opt,name=optional_message,json=optionalMessage" json:"optional_message,omitempty"`
 	RepeatedMessage []*TestRequired         `protobuf:"bytes,2,rep,name=repeated_message,json=repeatedMessage" json:"repeated_message,omitempty"`
 	MapMessage      map[int32]*TestRequired `protobuf:"bytes,3,rep,name=map_message,json=mapMessage" json:"map_message,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// Types that are valid to be assigned to OneofField:
+	// Types that are assignable to OneofField:
 	//	*TestRequiredForeign_OneofMessage
 	OneofField isTestRequiredForeign_OneofField `protobuf_oneof:"oneof_field"`
 }
@@ -1507,6 +1523,7 @@ type TestRequiredGroupFields struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	Optionalgroup *TestRequiredGroupFields_OptionalGroup   `protobuf:"group,1,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
 	Repeatedgroup []*TestRequiredGroupFields_RepeatedGroup `protobuf:"group,3,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
 }
@@ -1553,10 +1570,11 @@ func (x *TestRequiredGroupFields) GetRepeatedgroup() []*TestRequiredGroupFields_
 }
 
 type TestWeak struct {
-	state                 protoimpl.MessageState
-	sizeCache             protoimpl.SizeCache
-	XXX_weak              protoimpl.WeakFields `json:"-"`
-	unknownFields         protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	XXX_weak      protoimpl.WeakFields `json:"-"`
+	unknownFields protoimpl.UnknownFields
+
 	XXX_weak_WeakMessage1 struct{} `protobuf:"bytes,1,opt,name=weak_message1,json=weakMessage1,weak=goproto.proto.test.weak.WeakImportMessage1" json:"weak_message1,omitempty"`
 	XXX_weak_WeakMessage2 struct{} `protobuf:"bytes,2,opt,name=weak_message2,json=weakMessage2,weak=goproto.proto.test.weak.WeakImportMessage2" json:"weak_message2,omitempty"`
 }
@@ -1635,9 +1653,10 @@ func (x *TestWeak) SetWeakMessage2(v protoiface.MessageV1) {
 }
 
 type TestPackedTypes struct {
-	state          protoimpl.MessageState
-	sizeCache      protoimpl.SizeCache
-	unknownFields  protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	PackedInt32    []int32       `protobuf:"varint,90,rep,packed,name=packed_int32,json=packedInt32" json:"packed_int32,omitempty"`
 	PackedInt64    []int64       `protobuf:"varint,91,rep,packed,name=packed_int64,json=packedInt64" json:"packed_int64,omitempty"`
 	PackedUint32   []uint32      `protobuf:"varint,92,rep,packed,name=packed_uint32,json=packedUint32" json:"packed_uint32,omitempty"`
@@ -1780,9 +1799,10 @@ func (x *TestPackedTypes) GetPackedEnum() []ForeignEnum {
 }
 
 type TestUnpackedTypes struct {
-	state            protoimpl.MessageState
-	sizeCache        protoimpl.SizeCache
-	unknownFields    protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	UnpackedInt32    []int32       `protobuf:"varint,90,rep,name=unpacked_int32,json=unpackedInt32" json:"unpacked_int32,omitempty"`
 	UnpackedInt64    []int64       `protobuf:"varint,91,rep,name=unpacked_int64,json=unpackedInt64" json:"unpacked_int64,omitempty"`
 	UnpackedUint32   []uint32      `protobuf:"varint,92,rep,name=unpacked_uint32,json=unpackedUint32" json:"unpacked_uint32,omitempty"`
@@ -2081,8 +2101,9 @@ type TestAllTypes_NestedMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32        `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	Corecursive   *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
+
+	A           *int32        `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
 }
 
 func (x *TestAllTypes_NestedMessage) Reset() {
@@ -2130,7 +2151,8 @@ type TestAllTypes_OptionalGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
+
+	A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *TestAllTypes_OptionalGroup) Reset() {
@@ -2171,7 +2193,8 @@ type TestAllTypes_RepeatedGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
+
+	A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *TestAllTypes_RepeatedGroup) Reset() {
@@ -2212,7 +2235,8 @@ type TestRequiredGroupFields_OptionalGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
+
+	A *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
 }
 
 func (x *TestRequiredGroupFields_OptionalGroup) Reset() {
@@ -2253,7 +2277,8 @@ type TestRequiredGroupFields_RepeatedGroup struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
+
+	A *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
 }
 
 func (x *TestRequiredGroupFields_RepeatedGroup) Reset() {

internal/testprotos/test/test.proto

@@ -132,7 +132,6 @@ message TestDeprecatedMessage {
   enum DeprecatedEnum {
     option deprecated = true;
     DEPRECATED = 0 [deprecated=true];
-    //DEPRECATED = 0 [deprecated=true];
   }
   oneof deprecated_oneof {
     int32 deprecated_oneof_field = 2 [deprecated = true];

internal/testprotos/test/test_import.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test/test_import.proto
 

internal/testprotos/test/test_public.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test/test_public.proto
 

internal/testprotos/test/weak1/test_weak.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test/weak1/test_weak.proto
 
@@ -21,7 +25,8 @@ type WeakImportMessage1 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+
+	A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *WeakImportMessage1) Reset() {

internal/testprotos/test/weak2/test_weak.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test/weak2/test_weak.proto
 
@@ -21,7 +25,8 @@ type WeakImportMessage2 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+
+	A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
 }
 
 func (x *WeakImportMessage2) Reset() {

internal/testprotos/test3/test.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test3/test.proto
 
@@ -76,7 +80,7 @@ const (
 	TestAllTypes_FOO TestAllTypes_NestedEnum = 0
 	TestAllTypes_BAR TestAllTypes_NestedEnum = 1
 	TestAllTypes_BAZ TestAllTypes_NestedEnum = 2
-	TestAllTypes_NEG TestAllTypes_NestedEnum = -1
+	TestAllTypes_NEG TestAllTypes_NestedEnum = -1 // Intentionally negative.
 )
 
 // Enum value maps for TestAllTypes_NestedEnum.
@@ -123,9 +127,10 @@ func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) {
 }
 
 type TestAllTypes struct {
-	state                  protoimpl.MessageState
-	sizeCache              protoimpl.SizeCache
-	unknownFields          protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	OptionalInt32          int32                                  `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32,proto3" json:"optional_int32,omitempty"`
 	OptionalInt64          int64                                  `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64,proto3" json:"optional_int64,omitempty"`
 	OptionalUint32         uint32                                 `protobuf:"varint,3,opt,name=optional_uint32,json=optionalUint32,proto3" json:"optional_uint32,omitempty"`
@@ -185,7 +190,7 @@ type TestAllTypes struct {
 	MapStringBytes         map[string][]byte                      `protobuf:"bytes,70,rep,name=map_string_bytes,json=mapStringBytes,proto3" json:"map_string_bytes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	MapStringNestedMessage map[string]*TestAllTypes_NestedMessage `protobuf:"bytes,71,rep,name=map_string_nested_message,json=mapStringNestedMessage,proto3" json:"map_string_nested_message,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	MapStringNestedEnum    map[string]TestAllTypes_NestedEnum     `protobuf:"bytes,73,rep,name=map_string_nested_enum,json=mapStringNestedEnum,proto3" json:"map_string_nested_enum,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=goproto.proto.test3.TestAllTypes_NestedEnum"`
-	// Types that are valid to be assigned to OneofField:
+	// Types that are assignable to OneofField:
 	//	*TestAllTypes_OneofUint32
 	//	*TestAllTypes_OneofNestedMessage
 	//	*TestAllTypes_OneofString
@@ -770,8 +775,9 @@ type ForeignMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	C             int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
-	D             int32 `protobuf:"varint,2,opt,name=d,proto3" json:"d,omitempty"`
+
+	C int32 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"`
+	D int32 `protobuf:"varint,2,opt,name=d,proto3" json:"d,omitempty"`
 }
 
 func (x *ForeignMessage) Reset() {
@@ -819,8 +825,9 @@ type TestAllTypes_NestedMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	A             int32         `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
-	Corecursive   *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
+
+	A           int32         `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"`
+	Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"`
 }
 
 func (x *TestAllTypes_NestedMessage) Reset() {

internal/testprotos/test3/test_import.pb.go

@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test3/test_import.proto
 

reflect/protoregistry/testprotos/test.pb.go

@@ -1,3 +1,9 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Different proto type definitions for testing the Types registry.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: test.proto
 
@@ -291,7 +297,8 @@ type Message4 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	BoolField     *bool `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"`
+
+	BoolField *bool `protobuf:"varint,30,opt,name=bool_field,json=boolField" json:"bool_field,omitempty"`
 }
 
 func (x *Message4) Reset() {

types/descriptorpb/descriptor.pb.go

@@ -1,3 +1,41 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: kenton@google.com (Kenton Varda)
+//  Based on original Protocol Buffers design by
+//  Sanjay Ghemawat, Jeff Dean, and others.
+//
+// The messages in this file describe the definitions found in .proto files.
+// A valid .proto file can be translated directly to a FileDescriptorProto
+// without any other information (e.g. without reading its imports).
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/descriptor.proto
 
@@ -42,15 +80,15 @@ const (
 	// implementations should still be able to parse the group wire format and
 	// treat group fields as unknown fields.
 	FieldDescriptorProto_TYPE_GROUP   FieldDescriptorProto_Type = 10
-	FieldDescriptorProto_TYPE_MESSAGE FieldDescriptorProto_Type = 11
+	FieldDescriptorProto_TYPE_MESSAGE FieldDescriptorProto_Type = 11 // Length-delimited aggregate.
 	// New in version 2.
 	FieldDescriptorProto_TYPE_BYTES    FieldDescriptorProto_Type = 12
 	FieldDescriptorProto_TYPE_UINT32   FieldDescriptorProto_Type = 13
 	FieldDescriptorProto_TYPE_ENUM     FieldDescriptorProto_Type = 14
 	FieldDescriptorProto_TYPE_SFIXED32 FieldDescriptorProto_Type = 15
 	FieldDescriptorProto_TYPE_SFIXED64 FieldDescriptorProto_Type = 16
-	FieldDescriptorProto_TYPE_SINT32   FieldDescriptorProto_Type = 17
-	FieldDescriptorProto_TYPE_SINT64   FieldDescriptorProto_Type = 18
+	FieldDescriptorProto_TYPE_SINT32   FieldDescriptorProto_Type = 17 // Uses ZigZag encoding.
+	FieldDescriptorProto_TYPE_SINT64   FieldDescriptorProto_Type = 18 // Uses ZigZag encoding.
 )
 
 // Enum value maps for FieldDescriptorProto_Type.
@@ -198,10 +236,10 @@ func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) {
 type FileOptions_OptimizeMode int32
 
 const (
-	FileOptions_SPEED FileOptions_OptimizeMode = 1
+	FileOptions_SPEED FileOptions_OptimizeMode = 1 // Generate complete code for parsing, serialization,
 	// etc.
-	FileOptions_CODE_SIZE    FileOptions_OptimizeMode = 2
-	FileOptions_LITE_RUNTIME FileOptions_OptimizeMode = 3
+	FileOptions_CODE_SIZE    FileOptions_OptimizeMode = 2 // Use ReflectionOps to implement these methods.
+	FileOptions_LITE_RUNTIME FileOptions_OptimizeMode = 3 // Generate code using MessageLite and the lite runtime.
 )
 
 // Enum value maps for FileOptions_OptimizeMode.
@@ -384,8 +422,8 @@ type MethodOptions_IdempotencyLevel int32
 
 const (
 	MethodOptions_IDEMPOTENCY_UNKNOWN MethodOptions_IdempotencyLevel = 0
-	MethodOptions_NO_SIDE_EFFECTS     MethodOptions_IdempotencyLevel = 1
-	MethodOptions_IDEMPOTENT          MethodOptions_IdempotencyLevel = 2
+	MethodOptions_NO_SIDE_EFFECTS     MethodOptions_IdempotencyLevel = 1 // implies idempotent
+	MethodOptions_IDEMPOTENT          MethodOptions_IdempotencyLevel = 2 // idempotent, but may have side effects
 )
 
 // Enum value maps for MethodOptions_IdempotencyLevel.
@@ -445,7 +483,8 @@ type FileDescriptorSet struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	File          []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
+
+	File []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
 }
 
 func (x *FileDescriptorSet) Reset() {
@@ -487,8 +526,9 @@ type FileDescriptorProto struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Name          *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Package       *string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"`
+
+	Name    *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`       // file name, relative to root of source tree
+	Package *string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"` // e.g. "foo", "foo.bar", etc.
 	// Names of files imported by this file.
 	Dependency []string `protobuf:"bytes,3,rep,name=dependency" json:"dependency,omitempty"`
 	// Indexes of the public imported files in the dependency list above.
@@ -625,9 +665,10 @@ func (x *FileDescriptorProto) GetSyntax() string {
 
 // Describes a message type.
 type DescriptorProto struct {
-	state          protoimpl.MessageState
-	sizeCache      protoimpl.SizeCache
-	unknownFields  protoimpl.UnknownFields
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	Name           *string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	Field          []*FieldDescriptorProto           `protobuf:"bytes,2,rep,name=field" json:"field,omitempty"`
 	Extension      []*FieldDescriptorProto           `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
@@ -744,6 +785,7 @@ type ExtensionRangeOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -796,9 +838,10 @@ type FieldDescriptorProto struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Name          *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number        *int32                      `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
-	Label         *FieldDescriptorProto_Label `protobuf:"varint,4,opt,name=label,enum=google.protobuf.FieldDescriptorProto_Label" json:"label,omitempty"`
+
+	Name   *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number *int32                      `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
+	Label  *FieldDescriptorProto_Label `protobuf:"varint,4,opt,name=label,enum=google.protobuf.FieldDescriptorProto_Label" json:"label,omitempty"`
 	// If type_name is set, this need not be set.  If both this and type_name
 	// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
 	Type *FieldDescriptorProto_Type `protobuf:"varint,5,opt,name=type,enum=google.protobuf.FieldDescriptorProto_Type" json:"type,omitempty"`
@@ -930,8 +973,9 @@ type OneofDescriptorProto struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Name          *string       `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Options       *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
+
+	Name    *string       `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Options *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
 }
 
 func (x *OneofDescriptorProto) Reset() {
@@ -980,9 +1024,10 @@ type EnumDescriptorProto struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Name          *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Value         []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
-	Options       *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+
+	Name    *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Value   []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
+	Options *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
 	// Range of reserved numeric values. Reserved numeric values may not be used
 	// by enum values in the same enum declaration. Reserved ranges may not
 	// overlap.
@@ -1059,9 +1104,10 @@ type EnumValueDescriptorProto struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Name          *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number        *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
-	Options       *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+
+	Name    *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Number  *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
+	Options *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
 }
 
 func (x *EnumValueDescriptorProto) Reset() {
@@ -1117,9 +1163,10 @@ type ServiceDescriptorProto struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Name          *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Method        []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
-	Options       *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+
+	Name    *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Method  []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
+	Options *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
 }
 
 func (x *ServiceDescriptorProto) Reset() {
@@ -1175,7 +1222,8 @@ type MethodDescriptorProto struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Name          *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+
+	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	// Input and output type names.  These are resolved in the same way as
 	// FieldDescriptorProto.type_name, but must refer to a message type.
 	InputType  *string        `protobuf:"bytes,2,opt,name=input_type,json=inputType" json:"input_type,omitempty"`
@@ -1267,6 +1315,7 @@ type FileOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// Sets the Java package where classes generated from this .proto will be
 	// placed.  By default, the proto package is used, but this is often
 	// inappropriate because proto packages do not normally start with backwards
@@ -1286,7 +1335,9 @@ type FileOptions struct {
 	// top-level extensions defined in the file.
 	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,json=javaMultipleFiles,def=0" json:"java_multiple_files,omitempty"`
 	// This option does nothing.
-	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash" json:"java_generate_equals_and_hash,omitempty"` // Deprecated: Do not use.
+	//
+	// Deprecated: Do not use.
+	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash" json:"java_generate_equals_and_hash,omitempty"`
 	// If set true, then the Java2 code generator will generate code that
 	// throws an exception whenever an attempt is made to assign a non-UTF-8
 	// byte sequence to a string field.
@@ -1555,6 +1606,7 @@ type MessageOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// Set true to use the old proto1 MessageSet wire format for extensions.
 	// This is provided for backwards-compatibility with the MessageSet wire
 	// format.  You should not use this for any other reason:  It's less
@@ -1692,6 +1744,7 @@ type FieldOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// The ctype option instructs the C++ code generator to use a different
 	// representation of the field than it normally would.  See the specific
 	// options below.  This option is not yet implemented in the open source
@@ -1854,6 +1907,7 @@ type OneofOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// The parser stores options it doesn't recognize here. See above.
 	UninterpretedOption []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
 }
@@ -1906,6 +1960,7 @@ type EnumOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// Set this option to true to allow mapping different tag names to the same
 	// value.
 	AllowAlias *bool `protobuf:"varint,2,opt,name=allow_alias,json=allowAlias" json:"allow_alias,omitempty"`
@@ -1985,6 +2040,7 @@ type EnumValueOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// Is this enum value deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the enum value, or it will be completely ignored; in the very least,
@@ -2054,6 +2110,7 @@ type ServiceOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// Is this service deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the service, or it will be completely ignored; in the very least,
@@ -2123,6 +2180,7 @@ type MethodOptions struct {
 	sizeCache       protoimpl.SizeCache
 	unknownFields   protoimpl.UnknownFields
 	extensionFields protoimpl.ExtensionFields
+
 	// Is this method deprecated?
 	// Depending on the target platform, this can emit Deprecated annotations
 	// for the method, or it will be completely ignored; in the very least,
@@ -2206,7 +2264,8 @@ type UninterpretedOption struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Name          []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
+
+	Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
 	// The value of the uninterpreted option, in whatever type the tokenizer
 	// identified it as during parsing. Exactly one of these should be set.
 	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"`
@@ -2299,6 +2358,7 @@ type SourceCodeInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// A Location identifies a piece of source code in a .proto file which
 	// corresponds to a particular definition.  This information is intended
 	// to be useful to IDEs, code indexers, documentation generators, and similar
@@ -2386,6 +2446,7 @@ type GeneratedCodeInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// An Annotation connects some span of text in generated code to an element
 	// of its generating .proto file.
 	Annotation []*GeneratedCodeInfo_Annotation `protobuf:"bytes,1,rep,name=annotation" json:"annotation,omitempty"`
@@ -2429,9 +2490,10 @@ type DescriptorProto_ExtensionRange struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Start         *int32                 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End           *int32                 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	Options       *ExtensionRangeOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
+
+	Start   *int32                 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
+	End     *int32                 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+	Options *ExtensionRangeOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
 }
 
 func (x *DescriptorProto_ExtensionRange) Reset() {
@@ -2489,8 +2551,9 @@ type DescriptorProto_ReservedRange struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Start         *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End           *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+
+	Start *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` // Inclusive.
+	End   *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`     // Exclusive.
 }
 
 func (x *DescriptorProto_ReservedRange) Reset() {
@@ -2544,8 +2607,9 @@ type EnumDescriptorProto_EnumReservedRange struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Start         *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End           *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
+
+	Start *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"` // Inclusive.
+	End   *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`     // Inclusive.
 }
 
 func (x *EnumDescriptorProto_EnumReservedRange) Reset() {
@@ -2598,8 +2662,9 @@ type UninterpretedOption_NamePart struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	NamePart      *string `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"`
-	IsExtension   *bool   `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"`
+
+	NamePart    *string `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"`
+	IsExtension *bool   `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"`
 }
 
 func (x *UninterpretedOption_NamePart) Reset() {
@@ -2647,6 +2712,7 @@ type SourceCodeInfo_Location struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Identifies which part of the FileDescriptorProto was defined at this
 	// location.
 	//
@@ -2795,6 +2861,7 @@ type GeneratedCodeInfo_Annotation struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Identifies the element in the original source .proto file. This field
 	// is formatted the same as SourceCodeInfo.Location.path.
 	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`

types/known/anypb/any.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/any.proto
 
@@ -101,6 +131,7 @@ type Any struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// A URL/resource name that uniquely identifies the type of the serialized
 	// protocol buffer message. This string must contain at least
 	// one "/" character. The last segment of the URL's path must represent

types/known/apipb/api.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/api.proto
 
@@ -32,6 +62,7 @@ type Api struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The fully qualified name of this interface, including package name
 	// followed by the interface's simple name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
@@ -151,6 +182,7 @@ type Method struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The simple name of this method.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// A URL of the input message type.
@@ -325,6 +357,7 @@ type Mixin struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The fully qualified name of the interface which is included.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// If non-empty specifies a path under which inherited HTTP paths

types/known/durationpb/duration.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/duration.proto
 
@@ -81,6 +111,7 @@ type Duration struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Signed seconds of the span of time. Must be from -315,576,000,000
 	// to +315,576,000,000 inclusive. Note: these bounds are computed from:
 	// 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years

types/known/emptypb/empty.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/empty.proto
 

types/known/fieldmaskpb/field_mask.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/field_mask.proto
 
@@ -220,6 +250,7 @@ type FieldMask struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The set of field mask paths.
 	Paths []string `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
 }

types/known/sourcecontextpb/source_context.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/source_context.proto
 
@@ -23,6 +53,7 @@ type SourceContext struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The path-qualified name of the .proto file that contained the associated
 	// protobuf element.  For example: `"google/protobuf/source_context.proto"`.
 	FileName string `protobuf:"bytes,1,opt,name=file_name,json=fileName,proto3" json:"file_name,omitempty"`

types/known/structpb/struct.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/struct.proto
 
@@ -78,6 +108,7 @@ type Struct struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Unordered map of dynamically typed values.
 	Fields map[string]*Value `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
@@ -126,20 +157,15 @@ type Value struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The kind of value.
 	//
-	// Types that are valid to be assigned to Kind:
-	// Represents a null value.
+	// Types that are assignable to Kind:
 	//	*Value_NullValue
-	// Represents a double value.
 	//	*Value_NumberValue
-	// Represents a string value.
 	//	*Value_StringValue
-	// Represents a boolean value.
 	//	*Value_BoolValue
-	// Represents a structured value.
 	//	*Value_StructValue
-	// Represents a repeated `Value`.
 	//	*Value_ListValue
 	Kind isValue_Kind `protobuf_oneof:"kind"`
 }
@@ -225,26 +251,32 @@ type isValue_Kind interface {
 }
 
 type Value_NullValue struct {
+	// Represents a null value.
 	NullValue NullValue `protobuf:"varint,1,opt,name=null_value,json=nullValue,proto3,enum=google.protobuf.NullValue,oneof"`
 }
 
 type Value_NumberValue struct {
+	// Represents a double value.
 	NumberValue float64 `protobuf:"fixed64,2,opt,name=number_value,json=numberValue,proto3,oneof"`
 }
 
 type Value_StringValue struct {
+	// Represents a string value.
 	StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
 
 type Value_BoolValue struct {
+	// Represents a boolean value.
 	BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,proto3,oneof"`
 }
 
 type Value_StructValue struct {
+	// Represents a structured value.
 	StructValue *Struct `protobuf:"bytes,5,opt,name=struct_value,json=structValue,proto3,oneof"`
 }
 
 type Value_ListValue struct {
+	// Represents a repeated `Value`.
 	ListValue *ListValue `protobuf:"bytes,6,opt,name=list_value,json=listValue,proto3,oneof"`
 }
 
@@ -267,6 +299,7 @@ type ListValue struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Repeated field of dynamically typed values.
 	Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
 }

types/known/timestamppb/timestamp.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/timestamp.proto
 
@@ -103,6 +133,7 @@ type Timestamp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Represents seconds of UTC time since Unix epoch
 	// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
 	// 9999-12-31T23:59:59Z inclusive.

types/known/typepb/type.pb.go

@@ -1,3 +1,33 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/type.proto
 
@@ -248,6 +278,7 @@ type Type struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The fully qualified message name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The list of fields.
@@ -336,6 +367,7 @@ type Field struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The field type.
 	Kind Field_Kind `protobuf:"varint,1,opt,name=kind,proto3,enum=google.protobuf.Field_Kind" json:"kind,omitempty"`
 	// The field cardinality.
@@ -462,6 +494,7 @@ type Enum struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Enum type name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Enum value definitions.
@@ -541,6 +574,7 @@ type EnumValue struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Enum value name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Enum value number.
@@ -603,6 +637,7 @@ type Option struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The option's name. For protobuf built-in options (options defined in
 	// descriptor.proto), this is the short name. For example, `"map_entry"`.
 	// For custom options, it should be the fully-qualified name. For example,

types/known/wrapperspb/wrappers.pb.go

@@ -1,3 +1,43 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Wrappers for primitive (non-message) types. These types are useful
+// for embedding primitives in the `google.protobuf.Any` type and for places
+// where we need to distinguish between the absence of a primitive
+// typed field and its default value.
+//
+// These wrappers have no meaningful use within repeated fields as they lack
+// the ability to detect presence on individual elements.
+// These wrappers have no meaningful use within a map or a oneof since
+// individual entries of a map or fields of a oneof can already detect presence.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/wrappers.proto
 
@@ -24,6 +64,7 @@ type DoubleValue struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The double value.
 	Value float64 `protobuf:"fixed64,1,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -69,6 +110,7 @@ type FloatValue struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The float value.
 	Value float32 `protobuf:"fixed32,1,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -114,6 +156,7 @@ type Int64Value struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The int64 value.
 	Value int64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -159,6 +202,7 @@ type UInt64Value struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The uint64 value.
 	Value uint64 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -204,6 +248,7 @@ type Int32Value struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The int32 value.
 	Value int32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -249,6 +294,7 @@ type UInt32Value struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The uint32 value.
 	Value uint32 `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -294,6 +340,7 @@ type BoolValue struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The bool value.
 	Value bool `protobuf:"varint,1,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -339,6 +386,7 @@ type StringValue struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The string value.
 	Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -384,6 +432,7 @@ type BytesValue struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The bytes value.
 	Value []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 }

types/pluginpb/plugin.pb.go

@@ -1,3 +1,49 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: kenton@google.com (Kenton Varda)
+//
+// WARNING:  The plugin interface is currently EXPERIMENTAL and is subject to
+//   change.
+//
+// protoc (aka the Protocol Compiler) can be extended via plugins.  A plugin is
+// just a program that reads a CodeGeneratorRequest from stdin and writes a
+// CodeGeneratorResponse to stdout.
+//
+// Plugins written using C++ can use google/protobuf/compiler/plugin.h instead
+// of dealing with the raw protocol defined here.
+//
+// A plugin executable needs only to be placed somewhere in the path.  The
+// plugin should be named "protoc-gen-$NAME", and will then be used when the
+// flag "--${NAME}_out" is passed to protoc.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: google/protobuf/compiler/plugin.proto
 
@@ -23,9 +69,10 @@ type Version struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-	Major         *int32 `protobuf:"varint,1,opt,name=major" json:"major,omitempty"`
-	Minor         *int32 `protobuf:"varint,2,opt,name=minor" json:"minor,omitempty"`
-	Patch         *int32 `protobuf:"varint,3,opt,name=patch" json:"patch,omitempty"`
+
+	Major *int32 `protobuf:"varint,1,opt,name=major" json:"major,omitempty"`
+	Minor *int32 `protobuf:"varint,2,opt,name=minor" json:"minor,omitempty"`
+	Patch *int32 `protobuf:"varint,3,opt,name=patch" json:"patch,omitempty"`
 	// A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
 	// be empty for mainline stable releases.
 	Suffix *string `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"`
@@ -91,6 +138,7 @@ type CodeGeneratorRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The .proto files that were explicitly listed on the command-line.  The
 	// code generator should generate code only for these files.  Each file's
 	// descriptor will be included in proto_file, below.
@@ -176,6 +224,7 @@ type CodeGeneratorResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// Error message.  If non-empty, code generation failed.  The plugin process
 	// should exit with status code zero even if it reports an error in this way.
 	//
@@ -234,6 +283,7 @@ type CodeGeneratorResponse_File struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
 	// The file name, relative to the output directory.  The name must not
 	// contain "." or ".." components and must be relative, not be absolute (so,
 	// the file cannot lie outside the output directory).  "/" must be used as