types/descriptorpb: regenerate using latest protobuf v31 release

* Ignore the //clang-format off directive for copyright header checks.

* Run the conformance tests with the protolegacy build tag,
  because (with protobuf v31) the conformance tests now include
  a test for message sets (which are a protolegacy feature).

Change-Id: I23e649f433e9342020493180f20b92c1720da049
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/673495
Reviewed-by: Lasse Folger <lassefolger@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

Author: stapelberg

integration_test.go

@@ -33,16 +33,16 @@ var (
 	regenerate   = flag.Bool("regenerate", false, "regenerate files")
 	buildRelease = flag.Bool("buildRelease", false, "build release binaries")
 
-	protobufVersion = "30.0"
+	protobufVersion = "31.0"
 
 	golangVersions = func() []string {
 		// Version policy: oldest supported version of Go, plus the version before that.
 		// This matches the version policy of the Google Cloud Client Libraries:
 		// https://cloud.google.com/go/getting-started/supported-go-versions
 		return []string{
 			"1.22.12",
-			"1.23.6",
-			"1.24.0",
+			"1.23.9",
+			"1.24.2",
 		}
 	}()
 	golangLatest = golangVersions[len(golangVersions)-1]
@@ -157,7 +157,7 @@ func TestIntegration(t *testing.T) {
 			runGo("ProtoLegacyRace", command{}, "go", "test", "-race", "-tags", "protolegacy", "./...")
 			runGo("ProtoLegacy", command{}, "go", "test", "-tags", "protolegacy", "./...")
 			runGo("ProtocGenGo", command{Dir: "cmd/protoc-gen-go/testdata"}, "go", "test")
-			runGo("Conformance", command{Dir: "internal/conformance"}, "go", "test", "-execute")
+			runGo("Conformance", command{Dir: "internal/conformance"}, "go", "test", "-tags", "protolegacy", "-execute")
 
 			// Only run the 32-bit compatibility tests for Linux;
 			// avoid Darwin since 10.15 dropped support i386 code execution.
@@ -520,6 +520,10 @@ File:
 		if err != nil {
 			t.Fatal(err)
 		}
+		// Files like test_messages_proto2_editions.pb.go start with a
+		// clang-format directive that has to go before the copyright header for
+		// technical reasons.
+		b = bytes.TrimPrefix(b, []byte("// clang-format off\n"))
 		for _, re := range copyrightRegex {
 			if loc := re.FindIndex(b); loc != nil && loc[0] == 0 {
 				continue File

internal/conformance/failing_tests.txt

@@ -1 +1,2 @@
+Recommended.Proto2.ProtobufInput.ValidMessageSetEncoding.SubmessageEncoding.ProtobufOutput # Output was not equivalent to reference message: deleted: message_set_correct.(protobuf_test_messages.proto2.TestAllTypesProto2.M
 

internal/conformance/failing_tests_text_format.txt

@@ -13,6 +13,10 @@ Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongSh
 Required.Editions_Proto2.TextFormatInput.ClosedEnumFieldWithUnknownNumber                                          # Should have failed to parse, but didn't.
 Required.Editions_Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                 # Should have failed to parse, but didn't.
 Required.Editions_Proto3.TextFormatInput.FloatFieldNoOctal                                                         # Should have failed to parse, but didn't.
+Required.Editions_Proto3.TextFormatInput.Int32FieldTooLargeHex                                                     # Should have failed to parse, but didn't.
+Required.Editions_Proto3.TextFormatInput.Int64FieldTooLargeHex                                                     # Should have failed to parse, but didn't.
 Required.Proto2.TextFormatInput.ClosedEnumFieldWithUnknownNumber                                                   # Should have failed to parse, but didn't.
 Required.Proto3.TextFormatInput.FloatFieldNoNegativeOctal                                                          # Should have failed to parse, but didn't.
 Required.Proto3.TextFormatInput.FloatFieldNoOctal                                                                  # Should have failed to parse, but didn't.
+Required.Proto3.TextFormatInput.Int32FieldTooLargeHex                                                              # Should have failed to parse, but didn't.
+Required.Proto3.TextFormatInput.Int64FieldTooLargeHex                                                              # Should have failed to parse, but didn't.

internal/editiondefaults/editions_defaults.binpb

@@ -59,6 +59,13 @@ func TestInit(t *testing.T) {
 		// Support for weak fields has been removed.
 		descPkg.Append("FileDescriptorProto.weak_dependency"): true,
 
+		// TODO: Test option_dependency.
+		descPkg.Append("FileDescriptorProto.option_dependency"): true,
+
+		// Visibility is enforced in protoc, runtimes should not inspect this.
+		descPkg.Append("DescriptorProto.visibility"):     true,
+		descPkg.Append("EnumDescriptorProto.visibility"): true,
+
 		// Impossible to test proto3 optional in a proto2 file.
 		descPkg.Append("FieldDescriptorProto.proto3_optional"): true,
 

internal/filedesc/build_test.go

@@ -72,6 +72,9 @@ func unmarshalFeatureSet(b []byte, parent EditionFeatures) EditionFeatures {
 			case genid.FeatureSet_EnforceNamingStyle_field_number:
 				// EnforceNamingStyle is enforced in protoc, languages other than C++
 				// are not supposed to do anything with this feature.
+			case genid.FeatureSet_DefaultSymbolVisibility_field_number:
+				// DefaultSymbolVisibility is enforced in protoc, runtimes should not
+				// inspect this value.
 			default:
 				panic(fmt.Sprintf("unkown field number %d while unmarshalling FeatureSet", num))
 			}