From 2db0e9812a8774f5266370b7a6eae4e4e5a2cdd0 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Tue, 28 Apr 2020 16:15:30 -0400
Subject: [PATCH] Use the new helpers from Descriptor.

---
 .../protobuf/compiler/objectivec/objectivec_map_field.cc      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc b/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
index 3b8eaa040d..545660db77 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
@@ -85,9 +85,9 @@ MapFieldGenerator::MapFieldGenerator(const FieldDescriptor* descriptor,
                                      const Options& options)
     : RepeatedFieldGenerator(descriptor, options) {
   const FieldDescriptor* key_descriptor =
-      descriptor->message_type()->FindFieldByName("key");
+      descriptor->message_type()->map_key();
   const FieldDescriptor* value_descriptor =
-      descriptor->message_type()->FindFieldByName("value");
+      descriptor->message_type()->map_value();
   value_field_generator_.reset(FieldGenerator::Make(value_descriptor, options));
 
   // Pull over some variables_ from the value.