Adopt std::vector idiomatically for passing an owned array around.

PiperOrigin-RevId: 865929752

Author: protobuf-github-bot

src/google/protobuf/compiler/java/full/message.cc

@@ -564,7 +564,7 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
 
 void ImmutableMessageGenerator::GenerateMessageSerializationMethods(
     io::Printer* printer) {
-  std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
+  std::vector<const FieldDescriptor*> sorted_fields(
       SortFieldsByNumber(descriptor_));
 
   printer->Print(
@@ -599,7 +599,7 @@ void ImmutableMessageGenerator::GenerateMessageSerializationMethods(
 
   GenerateSerializeFieldsAndExtensions(printer,
                                        field_generators_.field_generators(),
-                                       descriptor_, sorted_fields.get());
+                                       descriptor_, sorted_fields);
 
   if (descriptor_->options().message_set_wire_format()) {
     printer->Print("getUnknownFields().writeAsMessageSetTo(output);\n");

src/google/protobuf/compiler/java/full/message_builder.cc

@@ -710,7 +710,7 @@ void MessageBuilderGenerator::GenerateBuilderParsingMethods(
 
 void MessageBuilderGenerator::GenerateBuilderFieldParsingCases(
     io::Printer* printer) {
-  std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
+  std::vector<const FieldDescriptor*> sorted_fields(
       SortFieldsByNumber(descriptor_));
   for (int i = 0; i < descriptor_->field_count(); i++) {
     const FieldDescriptor* field = sorted_fields[i];

src/google/protobuf/compiler/java/helpers.cc

@@ -781,14 +781,13 @@ int FixedSize(FieldDescriptor::Type type) {
 
 // Sort the fields of the given Descriptor by number into a new[]'d array
 // and return it. The caller should delete the returned array.
-const FieldDescriptor** SortFieldsByNumber(const Descriptor* descriptor) {
-  const FieldDescriptor** fields =
-      new const FieldDescriptor*[descriptor->field_count()];
-  for (int i = 0; i < descriptor->field_count(); i++) {
+std::vector<const FieldDescriptor*> SortFieldsByNumber(
+    const Descriptor* descriptor) {
+  std::vector<const FieldDescriptor*> fields(descriptor->field_count());
+  for (int i = 0; i < descriptor->field_count(); ++i) {
     fields[i] = descriptor->field(i);
   }
-  std::sort(fields, fields + descriptor->field_count(),
-            FieldOrderingByNumber());
+  std::sort(fields.begin(), fields.end(), FieldOrderingByNumber());
   return fields;
 }
 

src/google/protobuf/compiler/java/helpers.h

@@ -14,6 +14,7 @@
 
 #include <cstdint>
 #include <string>
+#include <vector>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
@@ -325,9 +326,9 @@ struct ExtensionRangeOrdering {
   }
 };
 
-// Sort the fields of the given Descriptor by number into a new[]'d array
-// and return it. The caller should delete the returned array.
-const FieldDescriptor** SortFieldsByNumber(const Descriptor* descriptor);
+// Sort the fields of the given Descriptor by number into the vector.
+std::vector<const FieldDescriptor*> SortFieldsByNumber(
+    const Descriptor* descriptor);
 
 // Does this message class have any packed fields?
 inline bool HasPackedFields(const Descriptor* descriptor) {

src/google/protobuf/compiler/java/lite/message.cc

@@ -531,7 +531,7 @@ void ImmutableMessageLiteGenerator::GenerateDynamicMethodNewBuildMessageInfo(
 
     int map_count = 0;
     int repeated_count = 0;
-    std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
+    std::vector<const FieldDescriptor*> sorted_fields(
         SortFieldsByNumber(descriptor_));
     for (int i = 0; i < descriptor_->field_count(); i++) {
       const FieldDescriptor* field = sorted_fields[i];

src/google/protobuf/compiler/java/message_serialization.h

@@ -32,8 +32,9 @@ void GenerateSerializeExtensionRange(io::Printer* printer,
 // number.
 inline void GenerateSerializeFieldsAndExtensions(
     io::Printer* printer,
-    const std::vector<const FieldGenerator*>& field_generators,
-    const Descriptor* descriptor, const FieldDescriptor** sorted_fields) {
+    absl::Span<const FieldGenerator* const> field_generators,
+    const Descriptor* descriptor,
+    absl::Span<const FieldDescriptor* const> sorted_fields) {
   std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
   sorted_extensions.reserve(descriptor->extension_range_count());
   for (int i = 0; i < descriptor->extension_range_count(); ++i) {