Minor refactor to avoid lifetime bound warnings on some callers.

PiperOrigin-RevId: 725319090
vraoresearch · Feb 10, 2025 · e3b1210 · e3b1210
1 parent 482f1ca
commit e3b1210
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc
@@ -2149,20 +2149,18 @@ const std::string& Reflection::GetRepeatedStringReference(
 }
 
 // See GetStringView(), above.
-absl::string_view Reflection::GetRepeatedStringView(
+absl::string_view Reflection::GetRepeatedStringViewImpl(
     const Message& message, const FieldDescriptor* field, int index,
-    ScratchSpace& scratch) const {
-  (void)scratch;
-  USAGE_CHECK_ALL(GetRepeatedStringView, REPEATED, STRING);
-
+    ScratchSpace* scratch) const {
   if (field->is_extension()) {
     return GetExtensionSet(message).GetRepeatedString(field->number(), index);
   }
 
   switch (field->cpp_string_type()) {
     case FieldDescriptor::CppStringType::kCord: {
       auto& cord = GetRepeatedField<absl::Cord>(message, field, index);
-      return scratch.CopyFromCord(cord);
+      ABSL_DCHECK(scratch);
+      return scratch->CopyFromCord(cord);
     }
     case FieldDescriptor::CppStringType::kView:
     case FieldDescriptor::CppStringType::kString:
@@ -2171,6 +2169,13 @@ absl::string_view Reflection::GetRepeatedStringView(
   internal::Unreachable();
 }
 
+absl::string_view Reflection::GetRepeatedStringView(
+    const Message& message, const FieldDescriptor* field, int index,
+    ScratchSpace& scratch) const {
+  USAGE_CHECK_ALL(GetRepeatedStringView, REPEATED, STRING);
+  return GetRepeatedStringViewImpl(message, field, index, &scratch);
+}
+
 
 void Reflection::SetRepeatedString(Message* message,
                                    const FieldDescriptor* field, int index,

diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h
@@ -991,6 +991,10 @@ class PROTOBUF_EXPORT Reflection final {
   absl::string_view GetStringViewImpl(const Message& message,
                                       const FieldDescriptor* field,
                                       ScratchSpace* scratch) const;
+  absl::string_view GetRepeatedStringViewImpl(const Message& message,
+                                              const FieldDescriptor* field,
+                                              int index,
+                                              ScratchSpace* scratch) const;
 
   // Obtain a pointer to a Repeated Field Structure and do some type checking:
   //   on field->cpp_type(),