Internal changes

PiperOrigin-RevId: 647549552

editions/codegen_tests/proto2_group.proto

@@ -12,7 +12,7 @@ package protobuf_editions_test.proto2;
 // LINT: ALLOW_GROUPS
 
 message Proto2Group {
-  optional group Groupfield = 2 {
+  optional group GroupField = 2 {
     optional int32 int32_field = 1;
   }
 
@@ -20,7 +20,7 @@ message Proto2Group {
 }
 
 extend Proto2Group {
-  optional group Groupextension = 10 {
+  optional group GroupExtension = 10 {
     optional int32 int32_field = 1;
   }
 }

hpb_generator/gen_enums.cc

@@ -85,7 +85,7 @@ void WriteEnumValues(const protobuf::EnumDescriptor* desc, Output& output) {
   for (int i = 0; i < value_count; i++) {
     values.push_back(desc->value(i));
   }
-  std::sort(values.begin(), values.end(),
+  std::stable_sort(values.begin(), values.end(),
                    [](const protobuf::EnumValueDescriptor* a,
                       const protobuf::EnumValueDescriptor* b) {
                      return a->number() < b->number();

src/google/protobuf/compiler/cpp/BUILD.bazel

@@ -112,6 +112,7 @@ cc_library(
         "//src/google/protobuf/compiler:versions",
         "//src/google/protobuf/io",
         "//src/google/protobuf/io:printer",
+        "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/container:flat_hash_map",

src/google/protobuf/compiler/cpp/enum.cc

@@ -19,6 +19,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/algorithm/container.h"
 #include "absl/container/btree_map.h"
 #include "absl/container/btree_set.h"
 #include "absl/container/flat_hash_map.h"
@@ -441,12 +442,12 @@ void EnumGenerator::GenerateMethods(int idx, io::Printer* p) {
       ++index;
       offset += e.first.size();
     }
-    absl::c_sort(offsets, [](const auto& a, const auto& b) {
+    absl::c_stable_sort(offsets, [](const auto& a, const auto& b) {
       return a.byte_offset < b.byte_offset;
     });
 
     std::vector<Offset> offsets_by_number = offsets;
-    absl::c_sort(offsets_by_number, [](const auto& a, const auto& b) {
+    absl::c_stable_sort(offsets_by_number, [](const auto& a, const auto& b) {
       return a.number < b.number;
     });
 

src/google/protobuf/compiler/csharp/csharp_reflection_class.cc

@@ -152,7 +152,9 @@ void ReflectionClassGenerator::WriteDescriptor(io::Printer* printer) {
   printer->Indent();
 
   // TODO: Consider a C#-escaping format here instead of just Base64.
-  std::string base64 = FileDescriptorToBase64(file_);
+  std::string base64 = options()->strip_nonfunctional_codegen
+                           ? ""
+                           : FileDescriptorToBase64(file_);
   while (base64.size() > 60) {
     printer->Print("\"$base64$\",\n", "base64", base64.substr(0, 60));
     base64 = base64.substr(60);
@@ -254,9 +256,21 @@ void ReflectionClassGenerator::WriteGeneratedCodeInfo(const Descriptor* descript
       std::vector<std::string> oneofs;
       oneofs.reserve(descriptor->oneof_decl_count());
       for (int i = 0; i < descriptor->oneof_decl_count(); i++) {
-          oneofs.push_back(UnderscoresToCamelCase(descriptor->oneof_decl(i)->name(), true));
+        if (options()->strip_nonfunctional_codegen &&
+            i >= descriptor->real_oneof_decl_count()) {
+          // Skip synthetic oneofs, which don't affect any actual behavior
+          // outside reflection.
+          break;
+        }
+        oneofs.push_back(
+            UnderscoresToCamelCase(descriptor->oneof_decl(i)->name(), true));
+      }
+      if (oneofs.empty()) {
+        printer->Print("null, ");
+      } else {
+        printer->Print("new[]{ \"$oneofs$\" }, ", "oneofs",
+                       absl::StrJoin(oneofs, "\", \""));
       }
-      printer->Print("new[]{ \"$oneofs$\" }, ", "oneofs", absl::StrJoin(oneofs, "\", \""));
   }
   else {
       printer->Print("null, ");

upb_generator/protoc-gen-upb.cc

@@ -243,7 +243,7 @@ void DumpEnumValues(upb::EnumDefPtr desc, Output& output) {
   for (int i = 0; i < desc.value_count(); i++) {
     values.push_back(desc.value(i));
   }
-  std::sort(values.begin(), values.end(),
+  std::stable_sort(values.begin(), values.end(),
                    [](upb::EnumValDefPtr a, upb::EnumValDefPtr b) {
                      return a.number() < b.number();
                    });