update protoc and run 'make generate-golden'

jhump · jhump · commit cb914171fb0d · 2025-12-15T18:34:25.000-05:00
diff --git a/.protoc_version b/.protoc_version
@@ -1 +1 @@
-32.0
+33.2
diff --git a/experimental/ir/testdata/editions/proto2.proto.stderr.txt b/experimental/ir/testdata/editions/proto2.proto.stderr.txt
@@ -64,9 +64,9 @@ warning: redundant custom option setting syntax
     |                       |
     |                       this field is not a message extension
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:801:23
+   ::: <built-in>/google/protobuf/descriptor.proto:807:23
     |
-801 |   optional FeatureSet features = 21;
+807 |   optional FeatureSet features = 21;
     |                       --------
     |                        |
     |                        field declared inside of `google.protobuf.FieldOptions` here
diff --git a/experimental/ir/testdata/extend/message_set.proto.stderr.txt b/experimental/ir/testdata/extend/message_set.proto.stderr.txt
@@ -24,9 +24,9 @@ warning: redundant custom option setting syntax
     |             |
     |             this field is not a message extension
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:600:17
+   ::: <built-in>/google/protobuf/descriptor.proto:606:17
     |
-600 |   optional bool message_set_wire_format = 1 [default = false];
+606 |   optional bool message_set_wire_format = 1 [default = false];
     |                 -----------------------
     |                  |
     |                  field declared inside of `google.protobuf.MessageOptions` here
@@ -78,9 +78,9 @@ warning: redundant custom option setting syntax
     |             |
     |             this field is not a message extension
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:600:17
+   ::: <built-in>/google/protobuf/descriptor.proto:606:17
     |
-600 |   optional bool message_set_wire_format = 1 [default = false];
+606 |   optional bool message_set_wire_format = 1 [default = false];
     |                 -----------------------
     |                  |
     |                  field declared inside of `google.protobuf.MessageOptions` here
diff --git a/experimental/ir/testdata/options/builtin.proto.stderr.txt b/experimental/ir/testdata/options/builtin.proto.stderr.txt
@@ -6,9 +6,9 @@ error: option `deprecated` set multiple times
  25 |     option deprecated = true;
     |            ^^^^^^^^^^ ... also set here
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:611:17
+   ::: <built-in>/google/protobuf/descriptor.proto:617:17
     |
-611 |   optional bool deprecated = 3 [default = false];
+617 |   optional bool deprecated = 3 [default = false];
     |                 ---------- not a repeated field
     |
     = note: a non-`repeated` option may be set at most once
diff --git a/experimental/ir/testdata/options/missing.proto.stderr.txt b/experimental/ir/testdata/options/missing.proto.stderr.txt
@@ -12,9 +12,9 @@ error: expected singular message, found scalar type `string`
     |         |
     |         found scalar type `string`
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:504:12
+   ::: <built-in>/google/protobuf/descriptor.proto:510:12
     |
-504 |   optional string go_package = 11;
+510 |   optional string go_package = 11;
     |            ------ type specified here
 
 error: cannot find message field `unknown` in `google.protobuf.MessageOptions`
@@ -31,9 +31,9 @@ error: expected singular message, found scalar type `bool`
     |             |
     |             found scalar type `bool`
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:611:12
+   ::: <built-in>/google/protobuf/descriptor.proto:617:12
     |
-611 |   optional bool deprecated = 3 [default = false];
+617 |   optional bool deprecated = 3 [default = false];
     |            ---- type specified here
 
 error: cannot find message field `unknown` in `google.protobuf.FieldOptions`
@@ -52,9 +52,9 @@ error: expected singular message, found scalar type `bool`
     |                                              |
     |                                              field selector requires singular message
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:743:12
+   ::: <built-in>/google/protobuf/descriptor.proto:749:12
     |
-743 |   optional bool lazy = 5 [default = false];
+749 |   optional bool lazy = 5 [default = false];
     |            ---- type specified here
 
 error: expected singular message, found scalar type `int32`
@@ -87,9 +87,9 @@ error: expected singular message, found scalar type `bool`
     |             |
     |             found scalar type `bool`
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:859:12
+   ::: <built-in>/google/protobuf/descriptor.proto:865:12
     |
-859 |   optional bool deprecated = 3 [default = false];
+865 |   optional bool deprecated = 3 [default = false];
     |            ---- type specified here
 
 error: cannot find message field `unknown` in `google.protobuf.EnumValueOptions`
@@ -108,9 +108,9 @@ error: expected singular message, found scalar type `bool`
     |                                            |
     |                                            field selector requires singular message
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:889:12
+   ::: <built-in>/google/protobuf/descriptor.proto:895:12
     |
-889 |   optional bool deprecated = 1 [default = false];
+895 |   optional bool deprecated = 1 [default = false];
     |            ---- type specified here
 
 encountered 12 errors
diff --git a/experimental/ir/testdata/options/redundant_fqn.proto.stderr.txt b/experimental/ir/testdata/options/redundant_fqn.proto.stderr.txt
@@ -6,9 +6,9 @@ warning: redundant custom option setting syntax
     |             |
     |             this field is not a message extension
     |
-   ::: <built-in>/google/protobuf/descriptor.proto:611:17
+   ::: <built-in>/google/protobuf/descriptor.proto:617:17
     |
-611 |   optional bool deprecated = 3 [default = false];
+617 |   optional bool deprecated = 3 [default = false];
     |                 ----------
     |                  |
     |                  field declared inside of `google.protobuf.MessageOptions` here
diff --git a/internal/testdata/all.protoset b/internal/testdata/all.protoset
diff --git a/internal/testdata/desc_test_complex.protoset b/internal/testdata/desc_test_complex.protoset
diff --git a/internal/testdata/desc_test_proto3_optional.protoset b/internal/testdata/desc_test_proto3_optional.protoset
diff --git a/internal/testdata/descriptor_impl_tests.protoset b/internal/testdata/descriptor_impl_tests.protoset
diff --git a/wellknownimports/google/protobuf/descriptor.proto b/wellknownimports/google/protobuf/descriptor.proto
@@ -86,6 +86,9 @@ enum Edition {
   EDITION_2023 = 1000;
   EDITION_2024 = 1001;
 
+  // A placeholder edition for developing and testing unscheduled features.
+  EDITION_UNSTABLE = 9999;
+
   // Placeholder editions for testing feature resolution.  These should not be
   // used or relied on outside of tests.
   EDITION_1_TEST_ONLY = 1;
@@ -398,6 +401,9 @@ message ServiceDescriptorProto {
   repeated MethodDescriptorProto method = 2;
 
   optional ServiceOptions options = 3;
+
+  reserved 4;
+  reserved "stream";
 }
 
 // Describes a method of a service.
@@ -1182,6 +1188,11 @@ message FeatureSet {
       full_name: ".pb.python",
       type: ".pb.PythonFeatures"
     },
+    declaration = {
+      number: 1100,
+      full_name: ".imp.impress_feature_set",
+      type: ".imp.ImpressFeatureSet"
+    },
     declaration = {
       number: 9989,
       full_name: ".pb.java_mutable",
diff --git a/wellknownimports/google/protobuf/timestamp.proto b/wellknownimports/google/protobuf/timestamp.proto
@@ -131,14 +131,15 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes";
 // ) to obtain a formatter capable of generating timestamps in this format.
 //
 message Timestamp {
-  // 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.
+  // Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must
+  // be between -315576000000 and 315576000000 inclusive (which corresponds to
+  // 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z).
   int64 seconds = 1;
 
-  // Non-negative fractions of a second at nanosecond resolution. Negative
-  // second values with fractions must still have non-negative nanos values
-  // that count forward in time. Must be from 0 to 999,999,999
+  // Non-negative fractions of a second at nanosecond resolution. This field is
+  // the nanosecond portion of the duration, not an alternative to seconds.
+  // Negative second values with fractions must still have non-negative nanos
+  // values that count forward in time. Must be between 0 and 999,999,999
   // inclusive.
   int32 nanos = 2;
 }

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ warning: redundant custom option setting syntax`
`64`	`64`	`\| \|`
`65`	`65`	`\| this field is not a message extension`
`66`	`66`	`\|`
`67`		`- ::: <built-in>/google/protobuf/descriptor.proto:801:23`
	`67`	`+ ::: <built-in>/google/protobuf/descriptor.proto:807:23`
`68`	`68`	`\|`
`69`		`-801 \| optional FeatureSet features = 21;`
	`69`	`+807 \| optional FeatureSet features = 21;`
`70`	`70`	`\| --------`
`71`	`71`	`\| \|`
`72`	`72`	\| field declared inside of `google.protobuf.FieldOptions` here
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ warning: redundant custom option setting syntax`
`24`	`24`	`\| \|`
`25`	`25`	`\| this field is not a message extension`
`26`	`26`	`\|`
`27`		`- ::: <built-in>/google/protobuf/descriptor.proto:600:17`
	`27`	`+ ::: <built-in>/google/protobuf/descriptor.proto:606:17`
`28`	`28`	`\|`
`29`		`-600 \| optional bool message_set_wire_format = 1 [default = false];`
	`29`	`+606 \| optional bool message_set_wire_format = 1 [default = false];`
`30`	`30`	`\| -----------------------`
`31`	`31`	`\| \|`
`32`	`32`	\| field declared inside of `google.protobuf.MessageOptions` here
`@@ -78,9 +78,9 @@ warning: redundant custom option setting syntax`
`78`	`78`	`\| \|`
`79`	`79`	`\| this field is not a message extension`
`80`	`80`	`\|`
`81`		`- ::: <built-in>/google/protobuf/descriptor.proto:600:17`
	`81`	`+ ::: <built-in>/google/protobuf/descriptor.proto:606:17`
`82`	`82`	`\|`
`83`		`-600 \| optional bool message_set_wire_format = 1 [default = false];`
	`83`	`+606 \| optional bool message_set_wire_format = 1 [default = false];`
`84`	`84`	`\| -----------------------`
`85`	`85`	`\| \|`
`86`	`86`	\| field declared inside of `google.protobuf.MessageOptions` here
Original file line number	Diff line number	Diff line change
@@ -6,9 +6,9 @@ error: option `deprecated` set multiple times
`6`	`6`	`25 \| option deprecated = true;`
`7`	`7`	`\| ^^^^^^^^^^ ... also set here`
`8`	`8`	`\|`
`9`		`- ::: <built-in>/google/protobuf/descriptor.proto:611:17`
	`9`	`+ ::: <built-in>/google/protobuf/descriptor.proto:617:17`
`10`	`10`	`\|`
`11`		`-611 \| optional bool deprecated = 3 [default = false];`
	`11`	`+617 \| optional bool deprecated = 3 [default = false];`
`12`	`12`	`\| ---------- not a repeated field`
`13`	`13`	`\|`
`14`	`14`	= note: a non-`repeated` option may be set at most once
Original file line number	Diff line number	Diff line change
@@ -12,9 +12,9 @@ error: expected singular message, found scalar type `string`
`12`	`12`	`\| \|`
`13`	`13`	\| found scalar type `string`
`14`	`14`	`\|`
`15`		`- ::: <built-in>/google/protobuf/descriptor.proto:504:12`
	`15`	`+ ::: <built-in>/google/protobuf/descriptor.proto:510:12`
`16`	`16`	`\|`
`17`		`-504 \| optional string go_package = 11;`
	`17`	`+510 \| optional string go_package = 11;`
`18`	`18`	`\| ------ type specified here`
`19`	`19`
`20`	`20`	error: cannot find message field `unknown` in `google.protobuf.MessageOptions`
@@ -31,9 +31,9 @@ error: expected singular message, found scalar type `bool`
`31`	`31`	`\| \|`
`32`	`32`	\| found scalar type `bool`
`33`	`33`	`\|`
`34`		`- ::: <built-in>/google/protobuf/descriptor.proto:611:12`
	`34`	`+ ::: <built-in>/google/protobuf/descriptor.proto:617:12`
`35`	`35`	`\|`
`36`		`-611 \| optional bool deprecated = 3 [default = false];`
	`36`	`+617 \| optional bool deprecated = 3 [default = false];`
`37`	`37`	`\| ---- type specified here`
`38`	`38`
`39`	`39`	error: cannot find message field `unknown` in `google.protobuf.FieldOptions`
@@ -52,9 +52,9 @@ error: expected singular message, found scalar type `bool`
`52`	`52`	`\| \|`
`53`	`53`	`\| field selector requires singular message`
`54`	`54`	`\|`
`55`		`- ::: <built-in>/google/protobuf/descriptor.proto:743:12`
	`55`	`+ ::: <built-in>/google/protobuf/descriptor.proto:749:12`
`56`	`56`	`\|`
`57`		`-743 \| optional bool lazy = 5 [default = false];`
	`57`	`+749 \| optional bool lazy = 5 [default = false];`
`58`	`58`	`\| ---- type specified here`
`59`	`59`
`60`	`60`	error: expected singular message, found scalar type `int32`
@@ -87,9 +87,9 @@ error: expected singular message, found scalar type `bool`
`87`	`87`	`\| \|`
`88`	`88`	\| found scalar type `bool`
`89`	`89`	`\|`
`90`		`- ::: <built-in>/google/protobuf/descriptor.proto:859:12`
	`90`	`+ ::: <built-in>/google/protobuf/descriptor.proto:865:12`
`91`	`91`	`\|`
`92`		`-859 \| optional bool deprecated = 3 [default = false];`
	`92`	`+865 \| optional bool deprecated = 3 [default = false];`
`93`	`93`	`\| ---- type specified here`
`94`	`94`
`95`	`95`	error: cannot find message field `unknown` in `google.protobuf.EnumValueOptions`
@@ -108,9 +108,9 @@ error: expected singular message, found scalar type `bool`
`108`	`108`	`\| \|`
`109`	`109`	`\| field selector requires singular message`
`110`	`110`	`\|`
`111`		`- ::: <built-in>/google/protobuf/descriptor.proto:889:12`
	`111`	`+ ::: <built-in>/google/protobuf/descriptor.proto:895:12`
`112`	`112`	`\|`
`113`		`-889 \| optional bool deprecated = 1 [default = false];`
	`113`	`+895 \| optional bool deprecated = 1 [default = false];`
`114`	`114`	`\| ---- type specified here`
`115`	`115`
`116`	`116`	`encountered 12 errors`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ warning: redundant custom option setting syntax`
`6`	`6`	`\| \|`
`7`	`7`	`\| this field is not a message extension`
`8`	`8`	`\|`
`9`		`- ::: <built-in>/google/protobuf/descriptor.proto:611:17`
	`9`	`+ ::: <built-in>/google/protobuf/descriptor.proto:617:17`
`10`	`10`	`\|`
`11`		`-611 \| optional bool deprecated = 3 [default = false];`
	`11`	`+617 \| optional bool deprecated = 3 [default = false];`
`12`	`12`	`\| ----------`
`13`	`13`	`\| \|`
`14`	`14`	\| field declared inside of `google.protobuf.MessageOptions` here