Integrated internal changes from Google

1 files changed, 8 insertions, 10 deletions

diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc
index 263d52ab..f0f207ea 100644
--- a/src/google/protobuf/generated_message_reflection.cc
+++ b/src/google/protobuf/generated_message_reflection.cc
@@ -2250,17 +2250,15 @@ class AssignDescriptorsHelper {
 
     file_level_metadata_->descriptor = descriptor;
 
-    if (!descriptor->options().map_entry()) {
-      // Only set reflection for non map types.
-      file_level_metadata_->reflection = new GeneratedMessageReflection(
-          descriptor, MigrationToReflectionSchema(default_instance_data_,
-                                                  offsets_, *schemas_),
-          ::google::protobuf::DescriptorPool::generated_pool(), factory_);
-      for (int i = 0; i < descriptor->enum_type_count(); i++) {
-        AssignEnumDescriptor(descriptor->enum_type(i));
-      }
-      schemas_++;
+    file_level_metadata_->reflection = new GeneratedMessageReflection(
+        descriptor,
+        MigrationToReflectionSchema(default_instance_data_, offsets_,
+                                    *schemas_),
+        ::google::protobuf::DescriptorPool::generated_pool(), factory_);
+    for (int i = 0; i < descriptor->enum_type_count(); i++) {
+      AssignEnumDescriptor(descriptor->enum_type(i));
     }
+    schemas_++;
     default_instance_data_++;
     file_level_metadata_++;
   }