OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 15:49:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix potential annotation testing interruption (#11460)

Browse source
This commit is contained in:
caramel 2024-10-21 07:46:50 +09:00
parent 7c5395237d
commit 75f88df856
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
patches/api/Test-changes.patch
View file

@ -108,8 +108,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
+ // Paper start - skip class if it's @NullMarked + // Paper start - skip class if it's @NullMarked
+ if (isClassNullMarked(clazz)) { + if (isClassNullMarked(clazz, foundClasses)) {
+ return; + continue;
+ } + }
+ // Paper end - skip class if it's @NullMarked + // Paper end - skip class if it's @NullMarked
+ +
@ -192,7 +192,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
+ // Paper start - skip class if it's @NullMarked + // Paper start - skip class if it's @NullMarked
+ private static boolean isClassNullMarked(@NotNull ClassNode clazz) { + private static boolean isClassNullMarked(@NotNull ClassNode clazz, @NotNull Map<String, ClassNode> allClasses) {
+ if (clazz.nestHostClass != null) {
+ final ClassNode nestHostNode = allClasses.get(clazz.nestHostClass);
+ if (nestHostNode != null) {
+ return isClassNullMarked0(nestHostNode);
+ }
+ }
+
+ return isClassNullMarked0(clazz);
+ }
+
+ private static boolean isClassNullMarked0(@NotNull ClassNode clazz) {
+ return clazz.visibleAnnotations != null && clazz.visibleAnnotations.stream().anyMatch(node -> "Lorg/jspecify/annotations/NullMarked;".equals(node.desc)); + return clazz.visibleAnnotations != null && clazz.visibleAnnotations.stream().anyMatch(node -> "Lorg/jspecify/annotations/NullMarked;".equals(node.desc));
+ } + }
+ // Paper end - skip class if it's @NullMarked + // Paper end - skip class if it's @NullMarked