Skip to content

Fix NPE in AnnotationsApplyVisitor #1371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

Fix NPE in AnnotationsApplyVisitor #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eac5c7
Fix NPE in AnnotationsApplyVisitor
Earthcomputer Sep 24, 2025
8c2c578
Fix test
Earthcomputer Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions ...ain/java/net/fabricmc/loom/configuration/providers/minecraft/AnnotationsApplyVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,34 @@
public record AnnotationsApplyVisitor(AnnotationsData annotationsData) implements TinyRemapper.ApplyVisitorProvider {
@Override
public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {
return new AnnotationsApplyClassVisitor(next, cls.getName(), annotationsData);
ClassAnnotationData classData = annotationsData.classes().get(cls.getName());

if (classData == null) {
return next;
}

return new AnnotationsApplyClassVisitor(next, classData);
}

public static class AnnotationsApplyClassVisitor extends ClassVisitor {
private final ClassAnnotationData classData;
private boolean hasAddedAnnotations;

public AnnotationsApplyClassVisitor(ClassVisitor cv, String className, AnnotationsData annotationsData) {
public AnnotationsApplyClassVisitor(ClassVisitor cv, ClassAnnotationData classData) {
super(Constants.ASM_VERSION, cv);
this.classData = annotationsData.classes().get(className);
this.classData = classData;
hasAddedAnnotations = false;
}

@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
if (classData != null) {
access = classData.modifyAccessFlags(access);
}

access = classData.modifyAccessFlags(access);
super.visit(version, access, name, signature, superName, interfaces);
}

@Override
public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String descriptor, boolean visible) {
if (classData != null && classData.typeAnnotationsToRemove().contains(new TypeAnnotationKey(typeRef, typePath.toString(), Type.getType(descriptor).getInternalName()))) {
if (classData.typeAnnotationsToRemove().contains(new TypeAnnotationKey(typeRef, typePath.toString(), Type.getType(descriptor).getInternalName()))) {
return null;
}

Expand All @@ -79,7 +82,7 @@ public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, Str

@Override
public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
if (classData != null && classData.annotationsToRemove().contains(Type.getType(descriptor).getInternalName())) {
if (classData.annotationsToRemove().contains(Type.getType(descriptor).getInternalName())) {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/net/fabricmc/loom/test/unit/processor/AnnotationsApplyTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class AnnotationsApplyTest extends Specification {
def annotationData = AnnotationsData.read(new StringReader(ANNOTATIONS_DATA))

def annotatedNode1 = new ClassNode()
def classVisitor1 = new AnnotationsApplyVisitor.AnnotationsApplyClassVisitor(annotatedNode1, 'net/fabricmc/loom/test/unit/processor/AnnotationsApplyTest$ExampleClass1', annotationData)
def classVisitor1 = new AnnotationsApplyVisitor.AnnotationsApplyClassVisitor(annotatedNode1, annotationData.classes().get('net/fabricmc/loom/test/unit/processor/AnnotationsApplyTest$ExampleClass1'))
def annotatedNode2 = new ClassNode()
def classVisitor2 = new AnnotationsApplyVisitor.AnnotationsApplyClassVisitor(annotatedNode2, 'net/fabricmc/loom/test/unit/processor/AnnotationsApplyTest$ExampleClass2', annotationData)
def classVisitor2 = new AnnotationsApplyVisitor.AnnotationsApplyClassVisitor(annotatedNode2, annotationData.classes().get('net/fabricmc/loom/test/unit/processor/AnnotationsApplyTest$ExampleClass2'))

when:
def classReader1 = new ClassReader(getClassBytes(ExampleClass1))
Expand Down