Skip to content

Call visitAnnotableParameterCount in AnnotationsApplyVisitor #1376

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 1 commit into from
Sep 30, 2025
Merged

Call visitAnnotableParameterCount in AnnotationsApplyVisitor #1376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 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 @@ -28,6 +28,7 @@
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.RecordComponentVisitor;
import org.objectweb.asm.Type;
import org.objectweb.asm.TypePath;
Expand Down Expand Up @@ -240,8 +241,19 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
}

return new MethodVisitor(Constants.ASM_VERSION, mv) {
int syntheticParameterCount = 0;
boolean visitedAnnotableParameterCount = false;
boolean hasAddedAnnotations = false;

@Override
public void visitParameter(String name, int access) {
if ((access & Opcodes.ACC_SYNTHETIC) != 0) {
syntheticParameterCount++;
}

super.visitParameter(name, access);
}

@Override
public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
if (methodData.annotationsToRemove().contains(Type.getType(descriptor).getInternalName())) {
Expand Down Expand Up @@ -271,6 +283,16 @@ public AnnotationVisitor visitParameterAnnotation(int parameter, String descript
return super.visitParameterAnnotation(parameter, descriptor, visible);
}

@Override
public void visitAnnotableParameterCount(int parameterCount, boolean visible) {
if (!visible && !methodData.parameters().isEmpty()) {
parameterCount = Math.max(parameterCount, Type.getArgumentCount(descriptor) - syntheticParameterCount);
visitedAnnotableParameterCount = true;
}

super.visitAnnotableParameterCount(parameterCount, visible);
}

@Override
public void visitCode() {
addMethodAnnotations();
Expand Down Expand Up @@ -306,6 +328,11 @@ void addMethodAnnotations() {
}
}

if (!visitedAnnotableParameterCount && !methodData.parameters().isEmpty()) {
mv.visitAnnotableParameterCount(Type.getArgumentCount(descriptor) - syntheticParameterCount, false);
visitedAnnotableParameterCount = true;
}

methodData.parameters().forEach((paramIndex, paramData) -> {
for (AnnotationNode annotation : paramData.annotationsToAdd()) {
AnnotationVisitor av = mv.visitParameterAnnotation(paramIndex, annotation.desc, false);
Expand Down