Internal Code Change

PiperOrigin-RevId: 532148865
2 years ago · fc7454acf8
parent 191f4be064
commit fc7454acf8
2 changed files with 3 additions and 3 deletions
--- a/src/google/protobuf/compiler/retention.cc
+++ b/src/google/protobuf/compiler/retention.cc
@ -299,8 +299,7 @@ MessageOptions StripLocalSourceRetentionOptions(const Descriptor& descriptor) {

 ExtensionRangeOptions StripLocalSourceRetentionOptions(
    const Descriptor& descriptor, const Descriptor::ExtensionRange& range) {
-  if (range.options_ == nullptr) return ExtensionRangeOptions{};
-  ExtensionRangeOptions options = *range.options_;
+  ExtensionRangeOptions options = range.options();
  ConvertToDynamicMessageAndStripOptions(options, GetPool(descriptor));
  return options;
 }
--- a/src/google/protobuf/retention_test.cc
+++ b/src/google/protobuf/retention_test.cc
@ -160,7 +160,8 @@ TEST(RetentionTest, ExtensionRange) {
  CheckOptionsMessageIsStrippedCorrectly(
      protobuf_unittest::TopLevelMessage::descriptor()
          ->extension_range(0)
-          ->options_->GetExtension(protobuf_unittest::extension_range_option));
+          ->options()
+          .GetExtension(protobuf_unittest::extension_range_option));
 }

 TEST(RetentionTest, Service) {