reflect: switch MessageType.New to return Message

Most usages of New actually prefer to interact with the reflective view
rather than the native Go type. Thus, change New to return that instead.
This parallels reflect.New, which returns the reflective view
(i.e., reflect.Value) instead of native type (i.e., interface{}).
We make the equivalent change to KnownFields.NewMessage, List.NewMessage,
and Map.NewMessage for consistency.

Since this is a subtle change where the type system will not always
catch the changed type, this change was made by both changing the type
and renaming the function to NewXXX and manually looking at every usage
of the the function to ensure that the usage correctly operates
on either the native Go type or the reflective view of the type.
After the entire codebase was cleaned up, a rename was performed to convert
NewXXX back to New.

Change-Id: I153fef627b4bf0a427e4039ce0aaec52e20c7950
Reviewed-on: https://go-review.googlesource.com/c/157077
Reviewed-by: Damien Neil <dneil@google.com>

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

@@ -159,14 +159,14 @@ var xxx_Grpc_ProtoFile_FileDesc = prototype.File{
 var xxx_Grpc_ProtoFile_MessageTypes = [2]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Grpc_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Request)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Request{new(Request)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Grpc_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Response)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Response{new(Response)}
 		},
 	)},
 }

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

@@ -241,8 +241,8 @@ func genReflectFileDescriptor(gen *protogen.Plugin, g *protogen.GeneratedFile, f
 			}
 			g.P("{Type: ", prototypePackage.Ident("GoMessage"), "(")
 			g.P(messageDescsVar, "[", i, "].Reference(),")
-			g.P("func(", protoreflectPackage.Ident("MessageType"), ") ", protoreflectPackage.Ident("ProtoMessage"), " {")
-			g.P("return new(", message.GoIdent, ")")
+			g.P("func(", protoreflectPackage.Ident("MessageType"), ") ", protoreflectPackage.Ident("Message"), " {")
+			g.P("return ", shadowTypeName(message.GoIdent), "{new(", message.GoIdent, ")}")
 			g.P("},")
 			g.P(")},")
 		}

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

@@ -178,8 +178,8 @@ var xxx_Annotations_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_Annotations_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Annotations_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(AnnotationsTestMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_AnnotationsTestMessage{new(AnnotationsTestMessage)}
 		},
 	)},
 }

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

@@ -413,38 +413,38 @@ var xxx_Comments_ProtoFile_FileDesc = prototype.File{
 var xxx_Comments_ProtoFile_MessageTypes = [6]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Comments_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message1)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message1{new(Message1)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Comments_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message2)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message2{new(Message2)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Comments_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message1_Message1A)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message1_Message1A{new(Message1_Message1A)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Comments_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message1_Message1B)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message1_Message1B{new(Message1_Message1B)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Comments_ProtoFile_MessageDescs[4].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message2_Message2A)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message2_Message2A{new(Message2_Message2A)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Comments_ProtoFile_MessageDescs[5].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message2_Message2B)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message2_Message2B{new(Message2_Message2B)}
 		},
 	)},
 }

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

@@ -164,8 +164,8 @@ var xxx_Deprecated_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_Deprecated_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Deprecated_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(DeprecatedMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_DeprecatedMessage{new(DeprecatedMessage)}
 		},
 	)},
 }

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

@@ -185,14 +185,14 @@ var xxx_Base_ProtoFile_FileDesc = prototype.File{
 var xxx_Base_ProtoFile_MessageTypes = [2]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Base_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(BaseMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_BaseMessage{new(BaseMessage)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Base_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(MessageSetWireFormatMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_MessageSetWireFormatMessage{new(MessageSetWireFormatMessage)}
 		},
 	)},
 }

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

@@ -1069,50 +1069,50 @@ var xxx_Ext_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_Ext_ProtoFile_MessageTypes = [8]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Ext_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message{new(Message)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Ext_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(ExtensionGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_ExtensionGroup{new(ExtensionGroup)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Ext_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(ExtendingMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_ExtendingMessage{new(ExtendingMessage)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Ext_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(RepeatedGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_RepeatedGroup{new(RepeatedGroup)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Ext_ProtoFile_MessageDescs[4].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Extendable)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Extendable{new(Extendable)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Ext_ProtoFile_MessageDescs[5].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(MessageSetWireFormatExtension)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_MessageSetWireFormatExtension{new(MessageSetWireFormatExtension)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Ext_ProtoFile_MessageDescs[6].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message_M)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message_M{new(Message_M)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Ext_ProtoFile_MessageDescs[7].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(ExtendingMessage_ExtendingMessageSubmessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_ExtendingMessage_ExtendingMessageSubmessage{new(ExtendingMessage_ExtendingMessageSubmessage)}
 		},
 	)},
 }

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

@@ -113,8 +113,8 @@ var xxx_Extra_ProtoFile_FileDesc = prototype.File{
 var xxx_Extra_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Extra_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(ExtraMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_ExtraMessage{new(ExtraMessage)}
 		},
 	)},
 }

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

@@ -534,8 +534,8 @@ var xxx_Ext3_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_Ext3_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Ext3_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message{new(Message)}
 		},
 	)},
 }

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

@@ -405,14 +405,14 @@ var xxx_Fieldnames_ProtoFile_FileDesc = prototype.File{
 var xxx_Fieldnames_ProtoFile_MessageTypes = [2]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Fieldnames_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message{new(Message)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Fieldnames_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message_OneofMessageConflict)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message_OneofMessageConflict{new(Message_OneofMessageConflict)}
 		},
 	)},
 }

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

@@ -185,8 +185,8 @@ var xxx_A_ProtoFile_FileDesc = prototype.File{
 var xxx_A_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_A_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Public)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Public{new(Public)}
 		},
 	)},
 }

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

@@ -128,8 +128,8 @@ var xxx_B_ProtoFile_FileDesc = prototype.File{
 var xxx_B_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_B_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Local)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Local{new(Local)}
 		},
 	)},
 }

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

@@ -516,14 +516,14 @@ var xxx_A_ProtoFile_EnumDescs = [3]prototype.Enum{
 var xxx_A_ProtoFile_MessageTypes = [2]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_A_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M{new(M)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_A_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M_Submessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M_Submessage{new(M_Submessage)}
 		},
 	)},
 }

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

@@ -104,8 +104,8 @@ var xxx_B_ProtoFile_FileDesc = prototype.File{
 var xxx_B_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_B_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M2)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M2{new(M2)}
 		},
 	)},
 }

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

@@ -104,8 +104,8 @@ var xxx_A_ProtoFile_FileDesc = prototype.File{
 var xxx_A_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_A_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Sub2Message)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Sub2Message{new(Sub2Message)}
 		},
 	)},
 }

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

@@ -102,8 +102,8 @@ var xxx_M_ProtoFile_FileDesc = prototype.File{
 var xxx_M_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_M_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M{new(M)}
 		},
 	)},
 }

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

@@ -212,14 +212,14 @@ var xxx_M1_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_M1_ProtoFile_MessageTypes = [2]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_M1_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M1)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M1{new(M1)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_M1_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M1_1)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M1_1{new(M1_1)}
 		},
 	)},
 }

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

@@ -103,8 +103,8 @@ var xxx_M2_ProtoFile_FileDesc = prototype.File{
 var xxx_M2_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_M2_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M2)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M2{new(M2)}
 		},
 	)},
 }

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

@@ -103,8 +103,8 @@ var xxx_M3_ProtoFile_FileDesc = prototype.File{
 var xxx_M3_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_M3_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M3)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M3{new(M3)}
 		},
 	)},
 }

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

@@ -103,8 +103,8 @@ var xxx_M4_ProtoFile_FileDesc = prototype.File{
 var xxx_M4_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_M4_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M4)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M4{new(M4)}
 		},
 	)},
 }

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

@@ -103,8 +103,8 @@ var xxx_M1_ProtoFile_FileDesc = prototype.File{
 var xxx_M1_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_M1_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M1)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M1{new(M1)}
 		},
 	)},
 }

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

@@ -103,8 +103,8 @@ var xxx_M2_ProtoFile_FileDesc = prototype.File{
 var xxx_M2_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_M2_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(M2)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_M2{new(M2)}
 		},
 	)},
 }

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

@@ -118,8 +118,8 @@ var xxx_TestImportA1M1_ProtoFile_FileDesc = prototype.File{
 var xxx_TestImportA1M1_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_TestImportA1M1_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(A1M1)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_A1M1{new(A1M1)}
 		},
 	)},
 }

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

@@ -118,8 +118,8 @@ var xxx_TestImportA1M2_ProtoFile_FileDesc = prototype.File{
 var xxx_TestImportA1M2_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_TestImportA1M2_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(A1M2)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_A1M2{new(A1M2)}
 		},
 	)},
 }

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

@@ -169,8 +169,8 @@ var xxx_TestImportAll_ProtoFile_FileDesc = prototype.File{
 var xxx_TestImportAll_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_TestImportAll_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(All)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_All{new(All)}
 		},
 	)},
 }

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

@@ -136,8 +136,8 @@ var xxx_Test_ProtoFile_FileDesc = prototype.File{
 var xxx_Test_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Foo)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Foo{new(Foo)}
 		},
 	)},
 }

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

@@ -185,8 +185,8 @@ var xxx_Nopackage_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_Nopackage_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Nopackage_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message{new(Message)}
 		},
 	)},
 }

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

@@ -559,14 +559,14 @@ var xxx_Enum_ProtoFile_EnumDescs = [6]prototype.Enum{
 var xxx_Enum_ProtoFile_MessageTypes = [2]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Enum_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(EnumContainerMessage1)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_EnumContainerMessage1{new(EnumContainerMessage1)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Enum_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(EnumContainerMessage1_EnumContainerMessage2)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_EnumContainerMessage1_EnumContainerMessage2{new(EnumContainerMessage1_EnumContainerMessage2)}
 		},
 	)},
 }

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

@@ -1620,26 +1620,26 @@ var xxx_Fields_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_Fields_ProtoFile_MessageTypes = [9]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Fields_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldTestMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldTestMessage{new(FieldTestMessage)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Fields_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldTestMessage_OptionalGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldTestMessage_OptionalGroup{new(FieldTestMessage_OptionalGroup)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Fields_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldTestMessage_RequiredGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldTestMessage_RequiredGroup{new(FieldTestMessage_RequiredGroup)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Fields_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldTestMessage_RepeatedGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldTestMessage_RepeatedGroup{new(FieldTestMessage_RepeatedGroup)}
 		},
 	)},
 	{ /* no message type for FieldTestMessage_MapInt32Int64Entry */ },
@@ -1647,14 +1647,14 @@ var xxx_Fields_ProtoFile_MessageTypes = [9]protoimpl.MessageType{
 	{ /* no message type for FieldTestMessage_MapFixed64EnumEntry */ },
 	{Type: prototype.GoMessage(
 		xxx_Fields_ProtoFile_MessageDescs[7].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldTestMessage_OneofGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldTestMessage_OneofGroup{new(FieldTestMessage_OneofGroup)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Fields_ProtoFile_MessageDescs[8].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldTestMessage_Message)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldTestMessage_Message{new(FieldTestMessage_Message)}
 		},
 	)},
 }

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

@@ -236,20 +236,20 @@ var xxx_NestedMessages_ProtoFile_FileDesc = prototype.File{
 var xxx_NestedMessages_ProtoFile_MessageTypes = [3]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_NestedMessages_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Layer1)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Layer1{new(Layer1)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_NestedMessages_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Layer1_Layer2)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Layer1_Layer2{new(Layer1_Layer2)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_NestedMessages_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Layer1_Layer2_Layer3)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Layer1_Layer2_Layer3{new(Layer1_Layer2_Layer3)}
 		},
 	)},
 }

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

@@ -122,8 +122,8 @@ var xxx_Proto2_ProtoFile_FileDesc = prototype.File{
 var xxx_Proto2_ProtoFile_MessageTypes = [1]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Proto2_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message{new(Message)}
 		},
 	)},
 }

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

@@ -553,8 +553,8 @@ var xxx_Fields_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_Fields_ProtoFile_MessageTypes = [5]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Fields_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldTestMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldTestMessage{new(FieldTestMessage)}
 		},
 	)},
 	{ /* no message type for FieldTestMessage_MapInt32Int64Entry */ },
@@ -562,8 +562,8 @@ var xxx_Fields_ProtoFile_MessageTypes = [5]protoimpl.MessageType{
 	{ /* no message type for FieldTestMessage_MapFixed64EnumEntry */ },
 	{Type: prototype.GoMessage(
 		xxx_Fields_ProtoFile_MessageDescs[4].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldTestMessage_Message)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldTestMessage_Message{new(FieldTestMessage_Message)}
 		},
 	)},
 }

encoding/textpb/decode.go

@@ -178,7 +178,7 @@ func (o UnmarshalOptions) unmarshalSingular(input text.Value, fd pref.FieldDescr
 		if input.Type() != text.Message {
 			return errors.New("%v contains invalid message/group value: %v", fd.FullName(), input)
 		}
-		m := knownFields.NewMessage(num).ProtoReflect()
+		m := knownFields.NewMessage(num)
 		if err := o.unmarshalMessage(input.Message(), m); !nerr.Merge(err) {
 			return err
 		}
@@ -294,7 +294,7 @@ func (o UnmarshalOptions) unmarshalList(inputList []text.Value, fd pref.FieldDes
 			if input.Type() != text.Message {
 				return errors.New("%v contains invalid message/group value: %v", fd.FullName(), input)
 			}
-			m := list.NewMessage().ProtoReflect()
+			m := list.NewMessage()
 			if err := o.unmarshalMessage(input.Message(), m); !nerr.Merge(err) {
 				return err
 			}
@@ -403,7 +403,7 @@ func (o UnmarshalOptions) unmarshalMapMessageValue(input text.Value, pkey pref.M
 	if input.Type() != 0 {
 		value = input.Message()
 	}
-	m := mmap.NewMessage().ProtoReflect()
+	m := mmap.NewMessage()
 	if err := o.unmarshalMessage(value, m); !nerr.Merge(err) {
 		return err
 	}

encoding/textpb/encode.go

@@ -378,7 +378,7 @@ func (o MarshalOptions) marshalAny(m pref.Message) (text.Value, error) {
 	if !nerr.Merge(err) {
 		return text.Value{}, err
 	}
-	em := emt.New()
+	em := emt.New().Interface()
 	// TODO: Need to set types registry in binary unmarshaling.
 	err = proto.Unmarshal(value.Bytes(), em)
 	if !nerr.Merge(err) {

encoding/textpb/other_test.go

@@ -156,7 +156,7 @@ func TestRoundTrip(t *testing.T) {
 			if err != nil {
 				t.Errorf("Marshal() returned error: %v\n\n", err)
 			}
-			gotMessage := tt.message.ProtoReflect().Type().New()
+			gotMessage := tt.message.ProtoReflect().Type().New().Interface()
 			err = textpb.Unmarshal(gotMessage, b)
 			if err != nil {
 				t.Errorf("Unmarshal() returned error: %v\n\n", err)

encoding/textpb/testprotos/pb2/test.pb.go

@@ -2239,116 +2239,116 @@ var xxx_Test_ProtoFile_EnumDescs = [2]prototype.Enum{
 var xxx_Test_ProtoFile_MessageTypes = [26]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Scalars)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Scalars{new(Scalars)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Repeats)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Repeats{new(Repeats)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Enums)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Enums{new(Enums)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Nests)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Nests{new(Nests)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[4].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Nested)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Nested{new(Nested)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[5].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Requireds)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Requireds{new(Requireds)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[6].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(PartialRequired)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_PartialRequired{new(PartialRequired)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[7].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Oneofs)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Oneofs{new(Oneofs)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[8].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Maps)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Maps{new(Maps)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[9].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(NestedWithRequired)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_NestedWithRequired{new(NestedWithRequired)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[10].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(IndirectRequired)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_IndirectRequired{new(IndirectRequired)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[11].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Extensions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Extensions{new(Extensions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[12].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(ExtensionsContainer)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_ExtensionsContainer{new(ExtensionsContainer)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[13].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(MessageSet)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_MessageSet{new(MessageSet)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[14].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(MessageSetExtension)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_MessageSetExtension{new(MessageSetExtension)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[15].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(KnownTypes)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_KnownTypes{new(KnownTypes)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[16].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Nests_OptGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Nests_OptGroup{new(Nests_OptGroup)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[17].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Nests_RptGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Nests_RptGroup{new(Nests_RptGroup)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[18].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Nests_OptGroup_OptNestedGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Nests_OptGroup_OptNestedGroup{new(Nests_OptGroup_OptNestedGroup)}
 		},
 	)},
 	{ /* no message type for Maps_Int32ToStrEntry */ },

encoding/textpb/testprotos/pb3/test.pb.go

@@ -559,26 +559,26 @@ var xxx_Test_ProtoFile_EnumDescs = [2]prototype.Enum{
 var xxx_Test_ProtoFile_MessageTypes = [4]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Scalars)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Scalars{new(Scalars)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Enums)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Enums{new(Enums)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Nests)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Nests{new(Nests)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Nested)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Nested{new(Nested)}
 		},
 	)},
 }

internal/cmd/generate-types/proto.go

@@ -193,7 +193,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp wire.Type, num wire.Numbe
 			return 0, wire.ParseError(n)
 		}
 		{{if or (eq .Name "Message") (eq .Name "Group") -}}
-		m := list.NewMessage().ProtoReflect()
+		m := list.NewMessage()
 		if err := o.unmarshalMessage(v, m); err != nil {
 			return 0, err
 		}

internal/impl/legacy_extension.go

@@ -127,13 +127,13 @@ func (p legacyExtensionFields) Range(f func(pref.FieldNumber, pref.Value) bool)
 	})
 }
 
-func (p legacyExtensionFields) NewMessage(n pref.FieldNumber) pref.ProtoMessage {
+func (p legacyExtensionFields) NewMessage(n pref.FieldNumber) pref.Message {
 	x := p.x.Get(n)
 	if x.Desc == nil {
 		panic("no extension descriptor registered")
 	}
 	xt := legacyWrapper.ExtensionTypeFromDesc(x.Desc)
-	return xt.ValueOf(xt.New()).Message().Interface()
+	return xt.ValueOf(xt.New()).Message()
 }
 
 func (p legacyExtensionFields) ExtensionTypes() pref.ExtensionFieldTypes {

internal/impl/message.go

@@ -275,9 +275,9 @@ func (fs *knownFields) Range(f func(pref.FieldNumber, pref.Value) bool) {
 	}
 	fs.extensionFields().Range(f)
 }
-func (fs *knownFields) NewMessage(n pref.FieldNumber) pref.ProtoMessage {
+func (fs *knownFields) NewMessage(n pref.FieldNumber) pref.Message {
 	if fi := fs.mi.fields[n]; fi != nil {
-		return fi.newMessage().Interface()
+		return fi.newMessage()
 	}
 	if fs.mi.Type.ExtensionRanges().Has(n) {
 		return fs.extensionFields().NewMessage(n)
@@ -307,7 +307,7 @@ func (emptyExtensionFields) Get(pref.FieldNumber) pref.Value               { ret
 func (emptyExtensionFields) Set(pref.FieldNumber, pref.Value)              { panic("extensions not supported") }
 func (emptyExtensionFields) Clear(pref.FieldNumber)                        { return } // noop
 func (emptyExtensionFields) Range(func(pref.FieldNumber, pref.Value) bool) { return }
-func (emptyExtensionFields) NewMessage(pref.FieldNumber) pref.ProtoMessage {
+func (emptyExtensionFields) NewMessage(pref.FieldNumber) pref.Message {
 	panic("extensions not supported")
 }
 func (emptyExtensionFields) ExtensionTypes() pref.ExtensionFieldTypes { return emptyExtensionTypes{} }

internal/impl/message_field.go

@@ -88,7 +88,7 @@ func fieldInfoForOneof(fd pref.FieldDescriptor, fs reflect.StructField, ot refle
 		},
 		newMessage: func() pref.Message {
 			// This is only valid for messages and panics for other kinds.
-			return conv.MessageType.New().ProtoReflect()
+			return conv.MessageType.New()
 		},
 	}
 }
@@ -274,7 +274,7 @@ func fieldInfoForMessage(fd pref.FieldDescriptor, fs reflect.StructField) fieldI
 			rv.Set(reflect.Zero(rv.Type()))
 		},
 		newMessage: func() pref.Message {
-			return conv.MessageType.New().ProtoReflect()
+			return conv.MessageType.New()
 		},
 	}
 }

internal/impl/message_test.go

@@ -219,7 +219,7 @@ var scalarProto2Type = pimpl.MessageType{Type: ptype.GoMessage(
 			{Name: "f22", Number: 22, Cardinality: pref.Optional, Kind: pref.BytesKind, Default: V([]byte("22"))},
 		},
 	}),
-	func(pref.MessageType) pref.ProtoMessage {
+	func(pref.MessageType) pref.Message {
 		return new(ScalarProto2)
 	},
 )}
@@ -325,7 +325,7 @@ var scalarProto3Type = pimpl.MessageType{Type: ptype.GoMessage(
 			{Name: "f22", Number: 22, Cardinality: pref.Optional, Kind: pref.BytesKind},
 		},
 	}),
-	func(pref.MessageType) pref.ProtoMessage {
+	func(pref.MessageType) pref.Message {
 		return new(ScalarProto3)
 	},
 )}
@@ -442,7 +442,7 @@ var listScalarsType = pimpl.MessageType{Type: ptype.GoMessage(
 			{Name: "f19", Number: 19, Cardinality: pref.Repeated, Kind: pref.BytesKind},
 		},
 	}),
-	func(pref.MessageType) pref.ProtoMessage {
+	func(pref.MessageType) pref.Message {
 		return new(ListScalars)
 	},
 )}
@@ -633,7 +633,7 @@ var mapScalarsType = pimpl.MessageType{Type: ptype.GoMessage(
 			mustMakeMapEntry(25, pref.StringKind, pref.BytesKind),
 		},
 	}),
-	func(pref.MessageType) pref.ProtoMessage {
+	func(pref.MessageType) pref.Message {
 		return new(MapScalars)
 	},
 )}
@@ -791,7 +791,7 @@ var oneofScalarsType = pimpl.MessageType{Type: ptype.GoMessage(
 		},
 		Oneofs: []ptype.Oneof{{Name: "union"}},
 	}),
-	func(pref.MessageType) pref.ProtoMessage {
+	func(pref.MessageType) pref.Message {
 		return new(OneofScalars)
 	},
 )}
@@ -994,7 +994,7 @@ var enumMessagesType = pimpl.MessageType{Type: ptype.GoMessage(
 		},
 		Oneofs: []ptype.Oneof{{Name: "union"}},
 	}),
-	func(pref.MessageType) pref.ProtoMessage {
+	func(pref.MessageType) pref.Message {
 		return new(EnumMessages)
 	},
 )}
@@ -1283,7 +1283,7 @@ func testLists(t *testing.T, p path, v pref.List, tt listOps) {
 				v.Append(e)
 			}
 		case appendMessageList:
-			m := v.NewMessage().ProtoReflect()
+			m := v.NewMessage()
 			v.Append(V(m))
 			testMessage(t, p, m, messageOps(op))
 		case truncList:

internal/legacy/extension.go

@@ -57,7 +57,7 @@ func extensionDescFromType(t pref.ExtensionType) *papi.ExtensionDesc {
 	var parent papi.Message
 	if mt, ok := t.ExtendedType().(pref.MessageType); ok {
 		// Create a new parent message and unwrap it if possible.
-		mv := mt.New()
+		mv := mt.New().Interface()
 		t := reflect.TypeOf(mv)
 		if mv, ok := mv.(pvalue.Unwrapper); ok {
 			t = reflect.TypeOf(mv.ProtoUnwrap())

internal/legacy/message.go

@@ -40,9 +40,9 @@ func loadMessageType(t reflect.Type) *pimpl.MessageType {
 	// Slow-path: derive message descriptor and initialize MessageType.
 	md := loadMessageDesc(t)
 	mt := new(pimpl.MessageType)
-	mt.Type = ptype.GoMessage(md, func(pref.MessageType) pref.ProtoMessage {
+	mt.Type = ptype.GoMessage(md, func(pref.MessageType) pref.Message {
 		p := reflect.New(t.Elem()).Interface()
-		return mt.MessageOf(p).Interface()
+		return mt.MessageOf(p)
 	})
 	messageTypeCache.Store(t, mt)
 	return mt

internal/testprotos/test/test.pb.go

@@ -1636,44 +1636,44 @@ var xxx_Test_ProtoFile_EnumDescs = [1]prototype.Enum{
 var xxx_Test_ProtoFile_MessageTypes = [24]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(TestAllTypes)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_TestAllTypes{new(TestAllTypes)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(TestAllExtensions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_TestAllExtensions{new(TestAllExtensions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(OptionalGroupExtension)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_OptionalGroupExtension{new(OptionalGroupExtension)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(RepeatedGroupExtension)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_RepeatedGroupExtension{new(RepeatedGroupExtension)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[4].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(TestAllTypes_NestedMessage)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_TestAllTypes_NestedMessage{new(TestAllTypes_NestedMessage)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[5].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(TestAllTypes_OptionalGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_TestAllTypes_OptionalGroup{new(TestAllTypes_OptionalGroup)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[6].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(TestAllTypes_RepeatedGroup)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_TestAllTypes_RepeatedGroup{new(TestAllTypes_RepeatedGroup)}
 		},
 	)},
 	{ /* no message type for TestAllTypes_MapInt32Int32Entry */ },

internal/value/list.go

@@ -42,7 +42,7 @@ func (ls listReflect) Append(v pref.Value) {
 func (ls listReflect) Truncate(i int) {
 	ls.v.Elem().Set(ls.v.Elem().Slice(0, i))
 }
-func (ls listReflect) NewMessage() pref.ProtoMessage {
+func (ls listReflect) NewMessage() pref.Message {
 	return ls.conv.MessageType.New()
 }
 func (ls listReflect) ProtoUnwrap() interface{} {

internal/value/map.go

@@ -76,7 +76,7 @@ func (ms mapReflect) Range(f func(pref.MapKey, pref.Value) bool) {
 		}
 	}
 }
-func (ms mapReflect) NewMessage() pref.ProtoMessage {
+func (ms mapReflect) NewMessage() pref.Message {
 	return ms.valConv.MessageType.New()
 }
 func (ms mapReflect) ProtoUnwrap() interface{} {

proto/decode.go

@@ -94,7 +94,7 @@ func (o UnmarshalOptions) unmarshalScalarField(b []byte, wtyp wire.Type, num wir
 		if knownFields.Has(num) && field.OneofType() == nil {
 			m = knownFields.Get(num).Message()
 		} else {
-			m = knownFields.NewMessage(num).ProtoReflect()
+			m = knownFields.NewMessage(num)
 			knownFields.Set(num, protoreflect.ValueOf(m))
 		}
 		if err := o.unmarshalMessage(v.Bytes(), m); err != nil {
@@ -125,7 +125,7 @@ func (o UnmarshalOptions) unmarshalMap(b []byte, wtyp wire.Type, num wire.Number
 	)
 	switch valField.Kind() {
 	case protoreflect.GroupKind, protoreflect.MessageKind:
-		val = protoreflect.ValueOf(mapv.NewMessage().ProtoReflect())
+		val = protoreflect.ValueOf(mapv.NewMessage())
 	}
 	// Map entries are represented as a two-element message with fields
 	// containing the key and value.

proto/decode_gen.go

@@ -565,7 +565,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp wire.Type, num wire.Numbe
 		if n < 0 {
 			return 0, wire.ParseError(n)
 		}
-		m := list.NewMessage().ProtoReflect()
+		m := list.NewMessage()
 		if err := o.unmarshalMessage(v, m); err != nil {
 			return 0, err
 		}
@@ -579,7 +579,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp wire.Type, num wire.Numbe
 		if n < 0 {
 			return 0, wire.ParseError(n)
 		}
-		m := list.NewMessage().ProtoReflect()
+		m := list.NewMessage()
 		if err := o.unmarshalMessage(v, m); err != nil {
 			return 0, err
 		}

reflect/protoreflect/type.go

@@ -233,11 +233,11 @@ type MessageType interface {
 	MessageDescriptor
 
 	// New returns a newly allocated empty message.
-	New() ProtoMessage
+	New() Message
 
 	// GoType returns the Go type of the allocated message.
 	//
-	// Invariant: t.GoType() == reflect.TypeOf(t.New())
+	// Invariant: t.GoType() == reflect.TypeOf(t.New().Interface())
 	GoType() reflect.Type
 }
 

reflect/protoreflect/value.go

@@ -102,7 +102,7 @@ type KnownFields interface {
 	// NewMessage returns a newly allocated empty message assignable to
 	// the field of the given number.
 	// It panics if the field is not a singular message.
-	NewMessage(FieldNumber) ProtoMessage
+	NewMessage(FieldNumber) Message
 
 	// ExtensionTypes are extension field types that are known by this
 	// specific message instance.
@@ -247,7 +247,7 @@ type List interface {
 
 	// NewMessage returns a newly allocated empty message assignable to a list entry.
 	// It panics if the list entry type is not a message.
-	NewMessage() ProtoMessage
+	NewMessage() Message
 }
 
 // Map is an unordered, associative map. Only elements within the map
@@ -287,5 +287,5 @@ type Map interface {
 
 	// NewMessage returns a newly allocated empty message assignable to a map value.
 	// It panics if the map value type is not a message.
-	NewMessage() ProtoMessage
+	NewMessage() Message
 }

reflect/protoregistry/testprotos/test.pb.go

@@ -517,26 +517,26 @@ var xxx_Test_ProtoFile_EnumDescs = [3]prototype.Enum{
 var xxx_Test_ProtoFile_MessageTypes = [4]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message1)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message1{new(Message1)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message2)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message2{new(Message2)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message3)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message3{new(Message3)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Test_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Message4)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Message4{new(Message4)}
 		},
 	)},
 }

reflect/prototype/go_type.go

@@ -49,7 +49,7 @@ func (t *goEnum) Format(s fmt.State, r rune) {
 
 // GoMessage creates a new protoreflect.MessageType by combining the provided
 // protoreflect.MessageDescriptor with the provided constructor function.
-func GoMessage(md protoreflect.MessageDescriptor, fn func(protoreflect.MessageType) protoreflect.ProtoMessage) protoreflect.MessageType {
+func GoMessage(md protoreflect.MessageDescriptor, fn func(protoreflect.MessageType) protoreflect.Message) protoreflect.MessageType {
 	if md.IsPlaceholder() {
 		panic("message descriptor must not be a placeholder")
 	}
@@ -60,7 +60,7 @@ func GoMessage(md protoreflect.MessageDescriptor, fn func(protoreflect.MessageTy
 
 type goMessage struct {
 	protoreflect.MessageDescriptor
-	new func(protoreflect.MessageType) protoreflect.ProtoMessage
+	new func(protoreflect.MessageType) protoreflect.Message
 
 	once sync.Once
 	typ  reflect.Type
@@ -70,11 +70,12 @@ func (t *goMessage) GoType() reflect.Type {
 	t.New() // initialize t.typ
 	return t.typ
 }
-func (t *goMessage) New() protoreflect.ProtoMessage {
+func (t *goMessage) New() protoreflect.Message {
 	m := t.new(t)
-	t.once.Do(func() { t.typ = reflect.TypeOf(m) })
-	if t.typ != reflect.TypeOf(m) {
-		panic(fmt.Sprintf("mismatching types for message: got %T, want %v", m, t.typ))
+	mi := m.Interface()
+	t.once.Do(func() { t.typ = reflect.TypeOf(mi) })
+	if t.typ != reflect.TypeOf(mi) {
+		panic(fmt.Sprintf("mismatching types for message: got %T, want %v", mi, t.typ))
 	}
 	return m
 }
@@ -217,7 +218,7 @@ func (t *goExtension) lazyInit() {
 			case protoreflect.MessageKind, protoreflect.GroupKind:
 				t.typ = t.messageType.GoType()
 				t.new = func() interface{} {
-					return t.messageType.New()
+					return t.messageType.New().Interface()
 				}
 				t.valueOf = func(v interface{}) protoreflect.Value {
 					mv := v.(protoreflect.ProtoMessage).ProtoReflect()

types/descriptor/descriptor.pb.go

@@ -3108,164 +3108,164 @@ var xxx_Descriptor_ProtoFile_EnumDescs = [6]prototype.Enum{
 var xxx_Descriptor_ProtoFile_MessageTypes = [27]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FileDescriptorSet)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FileDescriptorSet{new(FileDescriptorSet)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FileDescriptorProto)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FileDescriptorProto{new(FileDescriptorProto)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(DescriptorProto)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_DescriptorProto{new(DescriptorProto)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(ExtensionRangeOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_ExtensionRangeOptions{new(ExtensionRangeOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[4].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldDescriptorProto)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldDescriptorProto{new(FieldDescriptorProto)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[5].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(OneofDescriptorProto)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_OneofDescriptorProto{new(OneofDescriptorProto)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[6].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(EnumDescriptorProto)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_EnumDescriptorProto{new(EnumDescriptorProto)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[7].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(EnumValueDescriptorProto)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_EnumValueDescriptorProto{new(EnumValueDescriptorProto)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[8].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(ServiceDescriptorProto)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_ServiceDescriptorProto{new(ServiceDescriptorProto)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[9].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(MethodDescriptorProto)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_MethodDescriptorProto{new(MethodDescriptorProto)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[10].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FileOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FileOptions{new(FileOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[11].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(MessageOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_MessageOptions{new(MessageOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[12].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(FieldOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_FieldOptions{new(FieldOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[13].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(OneofOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_OneofOptions{new(OneofOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[14].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(EnumOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_EnumOptions{new(EnumOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[15].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(EnumValueOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_EnumValueOptions{new(EnumValueOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[16].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(ServiceOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_ServiceOptions{new(ServiceOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[17].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(MethodOptions)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_MethodOptions{new(MethodOptions)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[18].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(UninterpretedOption)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_UninterpretedOption{new(UninterpretedOption)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[19].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(SourceCodeInfo)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_SourceCodeInfo{new(SourceCodeInfo)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[20].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(GeneratedCodeInfo)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_GeneratedCodeInfo{new(GeneratedCodeInfo)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[21].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(DescriptorProto_ExtensionRange)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_DescriptorProto_ExtensionRange{new(DescriptorProto_ExtensionRange)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[22].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(DescriptorProto_ReservedRange)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_DescriptorProto_ReservedRange{new(DescriptorProto_ReservedRange)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[23].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(EnumDescriptorProto_EnumReservedRange)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_EnumDescriptorProto_EnumReservedRange{new(EnumDescriptorProto_EnumReservedRange)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[24].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(UninterpretedOption_NamePart)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_UninterpretedOption_NamePart{new(UninterpretedOption_NamePart)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[25].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(SourceCodeInfo_Location)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_SourceCodeInfo_Location{new(SourceCodeInfo_Location)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Descriptor_ProtoFile_MessageDescs[26].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(GeneratedCodeInfo_Annotation)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_GeneratedCodeInfo_Annotation{new(GeneratedCodeInfo_Annotation)}
 		},
 	)},
 }

types/plugin/plugin.pb.go

@@ -465,26 +465,26 @@ var xxx_Plugin_ProtoFile_FileDesc = prototype.File{
 var xxx_Plugin_ProtoFile_MessageTypes = [4]protoimpl.MessageType{
 	{Type: prototype.GoMessage(
 		xxx_Plugin_ProtoFile_MessageDescs[0].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(Version)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_Version{new(Version)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Plugin_ProtoFile_MessageDescs[1].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(CodeGeneratorRequest)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_CodeGeneratorRequest{new(CodeGeneratorRequest)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Plugin_ProtoFile_MessageDescs[2].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(CodeGeneratorResponse)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_CodeGeneratorResponse{new(CodeGeneratorResponse)}
 		},
 	)},
 	{Type: prototype.GoMessage(
 		xxx_Plugin_ProtoFile_MessageDescs[3].Reference(),
-		func(protoreflect.MessageType) protoreflect.ProtoMessage {
-			return new(CodeGeneratorResponse_File)
+		func(protoreflect.MessageType) protoreflect.Message {
+			return xxx_CodeGeneratorResponse_File{new(CodeGeneratorResponse_File)}
 		},
 	)},
 }