Breaking change: disallow incorrect ctype usage

mkruskal-google · copybara-github · commit 755b690a7c31 · 2024-01-09T17:34:13.000-08:00
PiperOrigin-RevId: 597091014
diff --git a/src/google/protobuf/compiler/cpp/generator.cc b/src/google/protobuf/compiler/cpp/generator.cc
@@ -376,7 +376,6 @@ absl::Status CppGenerator::ValidateFeatures(const FileDescriptor* file) const {
       }
     }
 
-#ifdef PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE
     if (field.options().has_ctype()) {
       if (field.cpp_type() != FieldDescriptor::CPPTYPE_STRING) {
         status = absl::FailedPreconditionError(absl::StrCat(
@@ -391,7 +390,6 @@ absl::Status CppGenerator::ValidateFeatures(const FileDescriptor* file) const {
         }
       }
     }
-#endif  // !PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE
   });
   return status;
 }
diff --git a/src/google/protobuf/compiler/cpp/generator_unittest.cc b/src/google/protobuf/compiler/cpp/generator_unittest.cc
@@ -148,7 +148,6 @@ TEST_F(CppGeneratorTest, LegacyClosedEnumImplicit) {
       "Field Foo.bar has a closed enum type with implicit presence.");
 }
 
-#ifdef PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE
 TEST_F(CppGeneratorTest, CtypeOnNoneStringFieldTest) {
   CreateTempFile("foo.proto",
                  R"schema(
@@ -181,7 +180,6 @@ TEST_F(CppGeneratorTest, CtypeOnExtensionTest) {
       "Extension bar specifies ctype=CORD which is "
       "not supported for extensions.");
 }
-#endif  // !PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE
 }  // namespace
 }  // namespace cpp
 }  // namespace compiler
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -167,10 +167,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 // Owner: ezb@
 #define PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API 1
 
-// Used to lock down wrong ctype usages in proto file.
-// Owner: jieluo@
-#define PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE 1
-
 #endif
 
 // Defines the Protobuf C++ Version for checking version compatibility at

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,6 @@ absl::Status CppGenerator::ValidateFeatures(const FileDescriptor* file) const {`
`376`	`376`	`}`
`377`	`377`	`}`
`378`	`378`
`379`		`-#ifdef PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE`
`380`	`379`	`if (field.options().has_ctype()) {`
`381`	`380`	`if (field.cpp_type() != FieldDescriptor::CPPTYPE_STRING) {`
`382`	`381`	`status = absl::FailedPreconditionError(absl::StrCat(`
`@@ -391,7 +390,6 @@ absl::Status CppGenerator::ValidateFeatures(const FileDescriptor* file) const {`
`391`	`390`	`}`
`392`	`391`	`}`
`393`	`392`	`}`
`394`		`-#endif // !PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE`
`395`	`393`	`});`
`396`	`394`	`return status;`
`397`	`395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ TEST_F(CppGeneratorTest, LegacyClosedEnumImplicit) {`
`148`	`148`	`"Field Foo.bar has a closed enum type with implicit presence.");`
`149`	`149`	`}`
`150`	`150`
`151`		`-#ifdef PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE`
`152`	`151`	`TEST_F(CppGeneratorTest, CtypeOnNoneStringFieldTest) {`
`153`	`152`	`CreateTempFile("foo.proto",`
`154`	`153`	`R"schema(`
`@@ -181,7 +180,6 @@ TEST_F(CppGeneratorTest, CtypeOnExtensionTest) {`
`181`	`180`	`"Extension bar specifies ctype=CORD which is "`
`182`	`181`	`"not supported for extensions.");`
`183`	`182`	`}`
`184`		`-#endif // !PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE`
`185`	`183`	`} // namespace`
`186`	`184`	`} // namespace cpp`
`187`	`185`	`} // namespace compiler`