[javac] Correctly take into account the @NullMarked status of enclo…

…sing types. PiperOrigin-RevId: 716367513
google · Jan 16, 2025 · b976bcc · b976bcc
1 parent bab9e6e
commit b976bcc
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/transpiler/java/com/google/j2cl/transpiler/frontend/javac/JavaEnvironment.java b/transpiler/java/com/google/j2cl/transpiler/frontend/javac/JavaEnvironment.java
@@ -1331,8 +1331,13 @@ private static boolean isNullMarked(Element element) {
     }
 
     Element enclosingElement = element.getEnclosingElement();
-    return (enclosingElement instanceof TypeElement || enclosingElement instanceof PackageElement)
-        && isNullMarked(enclosingElement);
+    while (enclosingElement != null
+        && !(enclosingElement instanceof TypeElement
+            || enclosingElement instanceof PackageElement)) {
+      enclosingElement = enclosingElement.getEnclosingElement();
+    }
+
+    return enclosingElement != null && isNullMarked(enclosingElement);
   }
 
   private static List<TypeParameterElement> getTypeParameters(TypeElement typeElement) {