cmd/protoc-gen-go: unexport implementation-specific XXX fields
We modify protoc-gen-go to stop generating exported XXX fields.
The unsafe implementation is unaffected by this change since unsafe
can access fields regardless of visibility. However, for the purego
implementation, we need to respect Go visibility rules as enforced
by the reflect package.
We work around this by generating a exporter function that given
a reference to the message and the field to export, returns a reference
to the unexported field value. This exporter function is protected by
a constant such that it is not linked into the final binary in non-purego
build environment.
Updates golang/protobuf#276
Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/testprotos/test/test.pb.go b/internal/testprotos/test/test.pb.go
index 9fa7865..e044c53 100644
--- a/internal/testprotos/test/test.pb.go
+++ b/internal/testprotos/test/test.pb.go
@@ -311,10 +311,9 @@
// *TestAllTypes_OneofFloat
// *TestAllTypes_OneofDouble
// *TestAllTypes_OneofEnum
- OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestAllTypes) Reset() {
@@ -1039,10 +1038,9 @@
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:
// *TestDeprecatedMessage_DeprecatedOneofField
- DeprecatedOneof isTestDeprecatedMessage_DeprecatedOneof `protobuf_oneof:"deprecated_oneof"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ DeprecatedOneof isTestDeprecatedMessage_DeprecatedOneof `protobuf_oneof:"deprecated_oneof"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestDeprecatedMessage) Reset() {
@@ -1102,11 +1100,10 @@
func (*TestDeprecatedMessage_DeprecatedOneofField) isTestDeprecatedMessage_DeprecatedOneof() {}
type ForeignMessage struct {
- C *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
- D *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ C *int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+ D *int32 `protobuf:"varint,2,opt,name=d" json:"d,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *ForeignMessage) Reset() {
@@ -1147,9 +1144,8 @@
}
type TestReservedFields struct {
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestReservedFields) Reset() {
@@ -1176,10 +1172,9 @@
}
type TestAllExtensions struct {
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_InternalExtensions protoimpl.ExtensionFields `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+ extensionFields protoimpl.ExtensionFields ``
}
func (x *TestAllExtensions) Reset() {
@@ -1215,10 +1210,9 @@
}
type OptionalGroupExtension struct {
- A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *OptionalGroupExtension) Reset() {
@@ -1252,10 +1246,9 @@
}
type RepeatedGroupExtension struct {
- A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *RepeatedGroupExtension) Reset() {
@@ -1289,9 +1282,8 @@
}
type TestNestedExtension struct {
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestNestedExtension) Reset() {
@@ -1318,10 +1310,9 @@
}
type TestRequired struct {
- RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ RequiredField *int32 `protobuf:"varint,1,req,name=required_field,json=requiredField" json:"required_field,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestRequired) Reset() {
@@ -1360,10 +1351,9 @@
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:
// *TestRequiredForeign_OneofMessage
- OneofField isTestRequiredForeign_OneofField `protobuf_oneof:"oneof_field"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ OneofField isTestRequiredForeign_OneofField `protobuf_oneof:"oneof_field"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestRequiredForeign) Reset() {
@@ -1435,11 +1425,10 @@
func (*TestRequiredForeign_OneofMessage) isTestRequiredForeign_OneofField() {}
type TestRequiredGroupFields struct {
- 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"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ 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"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestRequiredGroupFields) Reset() {
@@ -1480,10 +1469,9 @@
}
type TestWeak struct {
- WeakMessage *weak.WeakImportMessage `protobuf:"bytes,1,opt,name=weak_message,json=weakMessage" json:"weak_message,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ WeakMessage *weak.WeakImportMessage `protobuf:"bytes,1,opt,name=weak_message,json=weakMessage" json:"weak_message,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestWeak) Reset() {
@@ -1518,9 +1506,8 @@
// Test that RPC services work.
type FooRequest struct {
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *FooRequest) Reset() {
@@ -1547,9 +1534,8 @@
}
type FooResponse struct {
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *FooResponse) Reset() {
@@ -1576,11 +1562,10 @@
}
type TestAllTypes_NestedMessage struct {
- A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
- Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+ Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestAllTypes_NestedMessage) Reset() {
@@ -1621,10 +1606,9 @@
}
type TestAllTypes_OptionalGroup struct {
- A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ A *int32 `protobuf:"varint,17,opt,name=a" json:"a,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestAllTypes_OptionalGroup) Reset() {
@@ -1658,10 +1642,9 @@
}
type TestAllTypes_RepeatedGroup struct {
- A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ A *int32 `protobuf:"varint,47,opt,name=a" json:"a,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestAllTypes_RepeatedGroup) Reset() {
@@ -1695,10 +1678,9 @@
}
type TestRequiredGroupFields_OptionalGroup struct {
- A *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ A *int32 `protobuf:"varint,2,req,name=a" json:"a,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestRequiredGroupFields_OptionalGroup) Reset() {
@@ -1732,10 +1714,9 @@
}
type TestRequiredGroupFields_RepeatedGroup struct {
- A *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ A *int32 `protobuf:"varint,4,req,name=a" json:"a,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *TestRequiredGroupFields_RepeatedGroup) Reset() {
@@ -3475,6 +3456,200 @@
}
file_test_test_import_proto_init()
file_test_test_public_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_test_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestAllTypes); i {
+ case 79:
+ return &v.sizeCache
+ case 80:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestDeprecatedMessage); i {
+ case 2:
+ return &v.sizeCache
+ case 3:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ForeignMessage); i {
+ case 2:
+ return &v.sizeCache
+ case 3:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestReservedFields); i {
+ case 0:
+ return &v.sizeCache
+ case 1:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestAllExtensions); i {
+ case 0:
+ return &v.sizeCache
+ case 1:
+ return &v.unknownFields
+ case 2:
+ return &v.extensionFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*OptionalGroupExtension); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*RepeatedGroupExtension); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestNestedExtension); i {
+ case 0:
+ return &v.sizeCache
+ case 1:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestRequired); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestRequiredForeign); i {
+ case 4:
+ return &v.sizeCache
+ case 5:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestRequiredGroupFields); i {
+ case 2:
+ return &v.sizeCache
+ case 3:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestWeak); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*FooRequest); i {
+ case 0:
+ return &v.sizeCache
+ case 1:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*FooResponse); i {
+ case 0:
+ return &v.sizeCache
+ case 1:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestAllTypes_NestedMessage); i {
+ case 2:
+ return &v.sizeCache
+ case 3:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestAllTypes_OptionalGroup); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestAllTypes_RepeatedGroup); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestRequiredGroupFields_OptionalGroup); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_test_test_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*TestRequiredGroupFields_RepeatedGroup); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
file_test_test_proto_msgTypes[0].OneofWrappers = []interface{}{
(*TestAllTypes_OneofUint32)(nil),
(*TestAllTypes_OneofNestedMessage)(nil),
diff --git a/internal/testprotos/test/test_import.pb.go b/internal/testprotos/test/test_import.pb.go
index ea42b56..170ac51 100644
--- a/internal/testprotos/test/test_import.pb.go
+++ b/internal/testprotos/test/test_import.pb.go
@@ -66,9 +66,8 @@
}
type ImportMessage struct {
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *ImportMessage) Reset() {
@@ -140,6 +139,18 @@
if File_test_test_import_proto != nil {
return
}
+ if !protoimpl.UnsafeEnabled {
+ file_test_test_import_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ImportMessage); i {
+ case 0:
+ return &v.sizeCache
+ case 1:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
RawDescriptor: file_test_test_import_proto_rawDesc,
diff --git a/internal/testprotos/test/test_public.pb.go b/internal/testprotos/test/test_public.pb.go
index be20ac9..01037d5 100644
--- a/internal/testprotos/test/test_public.pb.go
+++ b/internal/testprotos/test/test_public.pb.go
@@ -18,9 +18,8 @@
)
type PublicImportMessage struct {
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *PublicImportMessage) Reset() {
@@ -88,6 +87,18 @@
if File_test_test_public_proto != nil {
return
}
+ if !protoimpl.UnsafeEnabled {
+ file_test_test_public_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*PublicImportMessage); i {
+ case 0:
+ return &v.sizeCache
+ case 1:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
RawDescriptor: file_test_test_public_proto_rawDesc,
diff --git a/internal/testprotos/test/weak/test_weak.pb.go b/internal/testprotos/test/weak/test_weak.pb.go
index f661776..23c4c6b 100644
--- a/internal/testprotos/test/weak/test_weak.pb.go
+++ b/internal/testprotos/test/weak/test_weak.pb.go
@@ -18,10 +18,9 @@
)
type WeakImportMessage struct {
- A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized protoimpl.UnknownFields `json:"-"`
- XXX_sizecache protoimpl.SizeCache `json:"-"`
+ A *int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
}
func (x *WeakImportMessage) Reset() {
@@ -98,6 +97,18 @@
if File_test_weak_test_weak_proto != nil {
return
}
+ if !protoimpl.UnsafeEnabled {
+ file_test_weak_test_weak_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*WeakImportMessage); i {
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
RawDescriptor: file_test_weak_test_weak_proto_rawDesc,