Internal change

PiperOrigin-RevId: 572987133

java/core/src/main/java/com/google/protobuf/java_features.proto

@@ -11,6 +11,9 @@ package pb;
 
 import "google/protobuf/descriptor.proto";
 
+option java_package = "com.google.protobuf";
+option java_outer_classname = "JavaFeaturesProto";
+
 extend google.protobuf.FeatureSet {
   optional JavaFeatures java = 1001;
 }

src/google/protobuf/editions/generated_files_test.cc

@@ -8,6 +8,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "google/protobuf/descriptor.h"
+#include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/editions/golden/test_messages_proto2.pb.h"
 #include "google/protobuf/editions/golden/test_messages_proto3.pb.h"
 #include "google/protobuf/editions/proto/test_editions_default_features.pb.h"

src/google/protobuf/editions/golden/compare_cpp_codegen_failure.txt

@@ -4,14 +4,14 @@
      ::_pbi::TcParser::GenericFallbackLite,  // fallback
    }, {{
 -    // optional int32 int32_field = 1;
-+    // int32 int32_field = 1 [features = {
++    // int32 int32_field = 1;
      {::_pbi::TcParser::FastV32S1,
       {8, 0, 0, PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_)}},
    }}, {{
      65535, 65535
    }}, {{
 -    // optional int32 int32_field = 1;
-+    // int32 int32_field = 1 [features = {
++    // int32 int32_field = 1;
      {PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_), _Internal::kHasBitsOffset + 0, 0,
      (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
    }},
@@ -20,7 +20,7 @@
  
    cached_has_bits = _impl_._has_bits_[0];
 -  // optional int32 int32_field = 1;
-+  // int32 int32_field = 1 [features = {
++  // int32 int32_field = 1;
    if (cached_has_bits & 0x00000001u) {
      target = ::proto2::internal::WireFormatLite::
          WriteInt32ToArrayWithField<1>(
@@ -29,7 +29,7 @@
    (void) cached_has_bits;
  
 -  // optional int32 int32_field = 1;
-+  // int32 int32_field = 1 [features = {
++  // int32 int32_field = 1;
    cached_has_bits = _impl_._has_bits_[0];
    if (cached_has_bits & 0x00000001u) {
      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
@@ -40,7 +40,7 @@
      kInt32FieldFieldNumber = 1,
    };
 -  // optional int32 int32_field = 1;
-+  // int32 int32_field = 1 [features = {
++  // int32 int32_field = 1;
    bool has_int32_field() const;
    void clear_int32_field() ;
    ::int32_t int32_field() const;
@@ -49,7 +49,7 @@
  // SimpleProto3
  
 -// optional int32 int32_field = 1;
-+// int32 int32_field = 1 [features = {
++// int32 int32_field = 1;
  inline bool SimpleProto3::has_int32_field() const {
    bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
    return value;

src/google/protobuf/editions/golden/compare_cpp_codegen_failure.xml

@@ -2,10 +2,10 @@
 <testsuites tests="1" name="AllTests">
 <testsuite name="EditionsCodegenTests">
 <testcase name="third_party/protobuf/editions/golden/simple_proto3.pb.cc" status="run" result="completed" classname="DiffTest">
-<failure message="Value of: third_party/protobuf/editions/golden/simple_proto3.pb.cc&#x0A;Expected: &#x0A;// Generated by the protocol buffer compiler.  DO NOT EDIT!&#x0A;// source: third_party/protobuf/editions/golden/simple_proto3.proto&#x0A;&#x0A;#include &quot;third_party/protobuf/editions/golden/simple_proto3.pb.h&quot;&#x0A;&#x0A;#include &lt;algorithm&gt;&#x0A;#include &quot;third_party/protobuf/io/coded_stream.h&quot;&#x0A;#include &quot;third_party/protobuf/extension_set.h&quot;&#x0A;#include &quot;third_party/protobuf/wire_format_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/io/zero_copy_stream_impl_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_tctable_impl.h&quot;&#x0A;// @@protoc_insertion_point(includes)&#x0A;&#x0A;// Must be included last.&#x0A;, with the difference:&#x0A;@@ @@&#x0A;     &amp;_SimpleProto3_default_instance_._instance,&#x0A;     ::_pbi::TcParser::GenericFallbackLite,  // fallback&#x0A;   }, {{&#x0A;-    // optional int32 int32_field = 1;&#x0A;+    // int32 int32_field = 1 [features = {&#x0A;     {::_pbi::TcParser::FastV32S1,&#x0A;      {8, 0, 0, PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_)}},&#x0A;   }}, {{&#x0A;     65535, 65535&#x0A;   }}, {{&#x0A;-    // optional int32 int32_field = 1;&#x0A;+    // int32 int32_field = 1 [features = {&#x0A;     {PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_), _Internal::kHasBitsOffset + 0, 0,&#x0A;     (0 | ::_fl::kFcOptional | ::_fl::kInt32)},&#x0A;   }},&#x0A;@@ @@&#x0A;   (void)cached_has_bits;&#x0A; &#x0A;   cached_has_bits = _impl_._has_bits_[0];&#x0A;-  // optional int32 int32_field = 1;&#x0A;+  // int32 int32_field = 1 [features = {&#x0A;   if (cached_has_bits &amp; 0x00000001u) {&#x0A;     target = ::proto2::internal::WireFormatLite::&#x0A;         WriteInt32ToArrayWithField&lt;1&gt;(&#x0A;@@ @@&#x0A;   // Prevent compiler warnings about cached_has_bits being unused&#x0A;   (void) cached_has_bits;&#x0A; &#x0A;-  // optional int32 int32_field = 1;&#x0A;+  // int32 int32_field = 1 [features = {&#x0A;   cached_has_bits = _impl_._has_bits_[0];&#x0A;   if (cached_has_bits &amp; 0x00000001u) {&#x0A;     total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(" type=""></failure>
+<failure message="Value of: third_party/protobuf/editions/golden/simple_proto3.pb.cc&#x0A;Expected: &#x0A;// Generated by the protocol buffer compiler.  DO NOT EDIT!&#x0A;// source: third_party/protobuf/editions/golden/simple_proto3.proto&#x0A;&#x0A;#include &quot;third_party/protobuf/editions/golden/simple_proto3.pb.h&quot;&#x0A;&#x0A;#include &lt;algorithm&gt;&#x0A;#include &quot;third_party/protobuf/io/coded_stream.h&quot;&#x0A;#include &quot;third_party/protobuf/extension_set.h&quot;&#x0A;#include &quot;third_party/protobuf/wire_format_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/io/zero_copy_stream_impl_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_tctable_impl.h&quot;&#x0A;// @@protoc_insertion_point(includes)&#x0A;&#x0A;// Must be included last.&#x0A;, with the difference:&#x0A;@@ @@&#x0A;     &amp;_SimpleProto3_default_instance_._instance,&#x0A;     ::_pbi::TcParser::GenericFallbackLite,  // fallback&#x0A;   }, {{&#x0A;-    // optional int32 int32_field = 1;&#x0A;+    // int32 int32_field = 1;&#x0A;     {::_pbi::TcParser::FastV32S1,&#x0A;      {8, 0, 0, PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_)}},&#x0A;   }}, {{&#x0A;     65535, 65535&#x0A;   }}, {{&#x0A;-    // optional int32 int32_field = 1;&#x0A;+    // int32 int32_field = 1;&#x0A;     {PROTOBUF_FIELD_OFFSET(SimpleProto3, _impl_.int32_field_), _Internal::kHasBitsOffset + 0, 0,&#x0A;     (0 | ::_fl::kFcOptional | ::_fl::kInt32)},&#x0A;   }},&#x0A;@@ @@&#x0A;   (void)cached_has_bits;&#x0A; &#x0A;   cached_has_bits = _impl_._has_bits_[0];&#x0A;-  // optional int32 int32_field = 1;&#x0A;+  // int32 int32_field = 1;&#x0A;   if (cached_has_bits &amp; 0x00000001u) {&#x0A;     target = ::proto2::internal::WireFormatLite::&#x0A;         WriteInt32ToArrayWithField&lt;1&gt;(&#x0A;@@ @@&#x0A;   // Prevent compiler warnings about cached_has_bits being unused&#x0A;   (void) cached_has_bits;&#x0A; &#x0A;-  // optional int32 int32_field = 1;&#x0A;+  // int32 int32_field = 1;&#x0A;   cached_has_bits = _impl_._has_bits_[0];&#x0A;   if (cached_has_bits &amp; 0x00000001u) {&#x0A;     total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(" type=""></failure>
 </testcase>
 <testcase name="third_party/protobuf/editions/golden/simple_proto3.pb.h" status="run" result="completed" classname="DiffTest">
-<failure message="Value of: third_party/protobuf/editions/golden/simple_proto3.pb.h&#x0A;Expected: &#x0A;// Generated by the protocol buffer compiler.  DO NOT EDIT!&#x0A;// source: third_party/protobuf/editions/golden/simple_proto3.proto&#x0A;&#x0A;#ifndef GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;#define GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;&#x0A;#include &lt;limits&gt;&#x0A;#include &lt;string&gt;&#x0A;#include &lt;type_traits&gt;&#x0A;#include &lt;utility&gt;&#x0A;&#x0A;#include &quot;third_party/protobuf/io/coded_stream.h&quot;&#x0A;#include &quot;third_party/protobuf/arena.h&quot;&#x0A;#include &quot;third_party/protobuf/arenastring.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_tctable_decl.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_util.h&quot;&#x0A;#include &quot;third_party/protobuf/metadata_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/message_lite.h&quot;&#x0A;// @@protoc_insertion_point(includes)&#x0A;&#x0A;// Must be included last.&#x0A;&#x0A;#endif  // GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;, with the difference:&#x0A;@@ @@&#x0A;   enum : int {&#x0A;     kInt32FieldFieldNumber = 1,&#x0A;   };&#x0A;-  // optional int32 int32_field = 1;&#x0A;+  // int32 int32_field = 1 [features = {&#x0A;   bool has_int32_field() const;&#x0A;   void clear_int32_field() ;&#x0A;   ::int32_t int32_field() const;&#x0A;@@ @@&#x0A; &#x0A; // SimpleProto3&#x0A; &#x0A;-// optional int32 int32_field = 1;&#x0A;+// int32 int32_field = 1 [features = {&#x0A; inline bool SimpleProto3::has_int32_field() const {&#x0A;   bool value = (_impl_._has_bits_[0] &amp; 0x00000001u) != 0;&#x0A;   return value;" type=""></failure>
+<failure message="Value of: third_party/protobuf/editions/golden/simple_proto3.pb.h&#x0A;Expected: &#x0A;// Generated by the protocol buffer compiler.  DO NOT EDIT!&#x0A;// source: third_party/protobuf/editions/golden/simple_proto3.proto&#x0A;&#x0A;#ifndef GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;#define GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;&#x0A;#include &lt;limits&gt;&#x0A;#include &lt;string&gt;&#x0A;#include &lt;type_traits&gt;&#x0A;#include &lt;utility&gt;&#x0A;&#x0A;#include &quot;third_party/protobuf/io/coded_stream.h&quot;&#x0A;#include &quot;third_party/protobuf/arena.h&quot;&#x0A;#include &quot;third_party/protobuf/arenastring.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_tctable_decl.h&quot;&#x0A;#include &quot;third_party/protobuf/generated_message_util.h&quot;&#x0A;#include &quot;third_party/protobuf/metadata_lite.h&quot;&#x0A;#include &quot;third_party/protobuf/message_lite.h&quot;&#x0A;// @@protoc_insertion_point(includes)&#x0A;&#x0A;// Must be included last.&#x0A;&#x0A;#endif  // GOOGLE_PROTOBUF_INCLUDED_third_5fparty_2fprotobuf_2feditions_2fgolden_2fsimple_5fproto3_2eproto_2epb_2eh&#x0A;, with the difference:&#x0A;@@ @@&#x0A;   enum : int {&#x0A;     kInt32FieldFieldNumber = 1,&#x0A;   };&#x0A;-  // optional int32 int32_field = 1;&#x0A;+  // int32 int32_field = 1;&#x0A;   bool has_int32_field() const;&#x0A;   void clear_int32_field() ;&#x0A;   ::int32_t int32_field() const;&#x0A;@@ @@&#x0A; &#x0A; // SimpleProto3&#x0A; &#x0A;-// optional int32 int32_field = 1;&#x0A;+// int32 int32_field = 1;&#x0A; inline bool SimpleProto3::has_int32_field() const {&#x0A;   bool value = (_impl_._has_bits_[0] &amp; 0x00000001u) != 0;&#x0A;   return value;" type=""></failure>
 </testcase>
 <testcase name="third_party/protobuf/editions/golden/simple_proto3.proto.static_reflection.h" status="run" result="completed" classname="DiffTest">
 </testcase>

src/google/protobuf/editions/golden/editions_transform_proto2.proto

@@ -14,13 +14,10 @@ edition = "2023";
 
 package protobuf_editions_test;
 
-import "google/protobuf/cpp_features.proto";
-
 option features.enum_type = CLOSED;
 option features.repeated_field_encoding = EXPANDED;
 option features.utf8_validation = UNVERIFIED;
 option features.json_format = LEGACY_BEST_EFFORT;
-option features.(pb.cpp).legacy_closed_enum = true;
 option java_multiple_files = true;
 option cc_enable_arenas = true;
 

src/google/protobuf/editions/golden/editions_transform_proto2_lite.proto

@@ -9,13 +9,10 @@ edition = "2023";
 
 package protobuf_editions_test;
 
-import "google/protobuf/cpp_features.proto";
-
 option features.enum_type = CLOSED;
 option features.repeated_field_encoding = EXPANDED;
 option features.utf8_validation = UNVERIFIED;
 option features.json_format = LEGACY_BEST_EFFORT;
-option features.(pb.cpp).legacy_closed_enum = true;
 option optimize_for = LITE_RUNTIME;
 
 message TestMessageLite {

src/google/protobuf/editions/golden/editions_transform_proto2_utf8_disabled.proto

@@ -9,13 +9,10 @@ edition = "2023";
 
 package protobuf_editions_test;
 
-import "google/protobuf/cpp_features.proto";
-
 option features.enum_type = CLOSED;
 option features.repeated_field_encoding = EXPANDED;
 option features.utf8_validation = UNVERIFIED;
 option features.json_format = LEGACY_BEST_EFFORT;
-option features.(pb.cpp).legacy_closed_enum = true;
 
 message TestMessageUtf8Disabled {
   string string_field = 1;

src/google/protobuf/editions/golden/test_messages_proto2.proto

@@ -15,13 +15,10 @@ edition = "2023";
 
 package protobuf_test_messages.proto2;
 
-import "google/protobuf/cpp_features.proto";
-
 option features.enum_type = CLOSED;
 option features.repeated_field_encoding = EXPANDED;
 option features.utf8_validation = UNVERIFIED;
 option features.json_format = LEGACY_BEST_EFFORT;
-option features.(pb.cpp).legacy_closed_enum = true;
 option java_package = "com.google.protobuf_test_messages.proto2";
 option objc_class_prefix = "Proto2";