Avoid skipping descriptors with option dependencies

mkruskal-google · copybara-github · commit 1bc2c6352aca · 2026-01-11T20:21:10.000-08:00
PiperOrigin-RevId: 855016246
diff --git a/java/core/src/main/java/com/google/protobuf/Descriptors.java b/java/core/src/main/java/com/google/protobuf/Descriptors.java
@@ -1768,7 +1768,8 @@ public boolean legacyEnumFieldTreatedAsClosed() {
       // This is especially important for descriptor.proto since getting the JavaFeaturesProto
       // extension itself involves calling legacyEnumFieldTreatedAsClosed() which would otherwise
       // infinite loop.
-      if (getFile().getDependencies().isEmpty()) {
+      if (getFile().getDependencies().isEmpty()
+          && getFile().proto.getOptionDependencyCount() == 0) {
         return getType() == Type.ENUM && getEnumType().isClosed();
       }
 

Original file line number	Diff line number	Diff line change
`@@ -1768,7 +1768,8 @@ public boolean legacyEnumFieldTreatedAsClosed() {`
`1768`	`1768`	`// This is especially important for descriptor.proto since getting the JavaFeaturesProto`
`1769`	`1769`	`// extension itself involves calling legacyEnumFieldTreatedAsClosed() which would otherwise`
`1770`	`1770`	`// infinite loop.`
`1771`		`- if (getFile().getDependencies().isEmpty()) {`
	`1771`	`+ if (getFile().getDependencies().isEmpty()`
	`1772`	`+ && getFile().proto.getOptionDependencyCount() == 0) {`
`1772`	`1773`	`return getType() == Type.ENUM && getEnumType().isClosed();`
`1773`	`1774`	`}`
`1774`	`1775`