Creating generic MaybeAddError helper function

PiperOrigin-RevId: 864953327

Author: karenwuz

src/google/protobuf/descriptor.cc

@@ -5005,9 +5005,9 @@ class DescriptorBuilder {
                        const DescriptorProto::ExtensionRange& proto) {}
   void ValidateExtensionRangeOptions(const DescriptorProto& proto,
                                      const Descriptor& message);
-  void MaybeAddFeatureSupportError(const absl::Status& feature_support_status,
-                                   const Message& proto,
-                                   absl::string_view full_name);
+  void MaybeAddError(const absl::Status& status, absl::string_view full_name,
+                     const Message& descriptor,
+                     DescriptorPool::ErrorCollector::ErrorLocation location);
   void ValidateExtensionDeclaration(
       absl::string_view full_name,
       const RepeatedPtrField<ExtensionRangeOptions_Declaration>& declarations,
@@ -6342,10 +6342,9 @@ FileDescriptor* DescriptorBuilder::BuildFileImpl(
 
   absl::StatusOr<FeatureResolver> feature_resolver =
       FeatureResolver::Create(file_->edition_, defaults);
-  if (!feature_resolver.ok()) {
-    AddError(proto.name(), proto, DescriptorPool::ErrorCollector::EDITIONS,
-             [&] { return std::string(feature_resolver.status().message()); });
-  } else {
+  MaybeAddError(feature_resolver.status(), proto.name(), proto,
+                DescriptorPool::ErrorCollector::EDITIONS);
+  if (feature_resolver.ok()) {
     feature_resolver_.emplace(std::move(feature_resolver).value());
   }
 
@@ -8496,15 +8495,15 @@ void DescriptorBuilder::ValidateOptions(const OneofDescriptor* /*oneof*/,
 }
 
 
-void DescriptorBuilder::MaybeAddFeatureSupportError(
-    const absl::Status& feature_support_status, const Message& proto,
-    absl::string_view full_name) {
-  if (feature_support_status.ok()) {
+void DescriptorBuilder::MaybeAddError(
+    const absl::Status& status, absl::string_view full_name,
+    const Message& descriptor,
+    DescriptorPool::ErrorCollector::ErrorLocation location) {
+  if (status.ok()) {
     return;
   }
-  std::string feature_support_error(feature_support_status.message());
-  AddError(full_name, proto, DescriptorPool::ErrorCollector::OPTION_NAME,
-           feature_support_error.c_str());
+  std::string error(status.message());
+  AddError(full_name, descriptor, location, error.c_str());
 }
 
 void DescriptorBuilder::ValidateOptions(const FieldDescriptor* field,
@@ -8515,8 +8514,8 @@ void DescriptorBuilder::ValidateOptions(const FieldDescriptor* field,
   if (pool_->enforce_feature_support_validation_) {
     absl::Status feature_support_status =
         FeatureResolver::ValidateFieldFeatureSupport(*field);
-    MaybeAddFeatureSupportError(feature_support_status, proto,
-                                field->full_name());
+    MaybeAddError(feature_support_status, field->full_name(), proto,
+                  DescriptorPool::ErrorCollector::OPTION_NAME);
   }
 
   ValidateFieldFeatures(field, proto);
@@ -8858,8 +8857,8 @@ void DescriptorBuilder::ValidateOptions(const EnumValueDescriptor* enum_value,
     absl::Status feature_support_result =
         FeatureResolver::ValidateFeatureSupport(
             enum_value->options().feature_support(), enum_value->full_name());
-    MaybeAddFeatureSupportError(feature_support_result, proto,
-                                enum_value->full_name());
+    MaybeAddError(feature_support_result, enum_value->full_name(), proto,
+                  DescriptorPool::ErrorCollector::OPTION_NAME);
   }
 }