[ObjC] Simplify root registry generation.

The the distinction in the output isn't worth it. PiperOrigin-RevId: 556828871
oap-project · Aug 14, 2023 · 740d314 · 740d314
1 parent bd9d689
commit 740d314
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 31 deletions.
diff --git a/objectivec/GPBAny.pbobjc.m b/objectivec/GPBAny.pbobjc.m
diff --git a/objectivec/GPBApi.pbobjc.m b/objectivec/GPBApi.pbobjc.m
diff --git a/objectivec/GPBDuration.pbobjc.m b/objectivec/GPBDuration.pbobjc.m
diff --git a/objectivec/GPBEmpty.pbobjc.m b/objectivec/GPBEmpty.pbobjc.m
diff --git a/objectivec/GPBFieldMask.pbobjc.m b/objectivec/GPBFieldMask.pbobjc.m
diff --git a/objectivec/GPBSourceContext.pbobjc.m b/objectivec/GPBSourceContext.pbobjc.m
diff --git a/objectivec/GPBStruct.pbobjc.m b/objectivec/GPBStruct.pbobjc.m
diff --git a/objectivec/GPBTimestamp.pbobjc.m b/objectivec/GPBTimestamp.pbobjc.m
diff --git a/objectivec/GPBType.pbobjc.m b/objectivec/GPBType.pbobjc.m
diff --git a/objectivec/GPBWrappers.pbobjc.m b/objectivec/GPBWrappers.pbobjc.m
diff --git a/src/google/protobuf/compiler/objectivec/file.cc b/src/google/protobuf/compiler/objectivec/file.cc
@@ -629,17 +629,10 @@ void FileGenerator::EmitRootImplementation(
   // output a registry to override to create the file specific
   // registry.
   if (extension_generators_.empty() && deps_with_extensions.empty()) {
-    if (file_->dependency_count() == 0) {
-      p->Emit(R"objc(
-        // No extensions in the file and no imports, so no need to generate
-        // +extensionRegistry.
-      )objc");
-    } else {
-      p->Emit(R"objc(
-        // No extensions in the file and none of the imports (direct or indirect)
-        // defined extensions, so no need to generate +extensionRegistry.
-      )objc");
-    }
+    p->Emit(R"objc(
+      // No extensions in the file and no imports or none of the imports (direct or
+      // indirect) defined extensions, so no need to generate +extensionRegistry.
+    )objc");
   } else {
     EmitRootExtensionRegistryImplementation(p, deps_with_extensions);
   }