Commit 9709abbc authored by Eric Bruneton's avatar Eric Bruneton

Restore bug fix, make previously added test pass.

parent b648d8fb
Pipeline #802 passed with stage
in 5 minutes and 53 seconds
......@@ -56,12 +56,12 @@ public class AnnotationRemapper extends AnnotationVisitor {
@Override
public void visitEnum(String name, String desc, String value) {
av.visitEnum(name, remapper.mapType(desc), value);
av.visitEnum(name, remapper.mapDesc(desc), value);
}
@Override
public AnnotationVisitor visitAnnotation(String name, String desc) {
AnnotationVisitor v = av.visitAnnotation(name, remapper.mapType(desc));
AnnotationVisitor v = av.visitAnnotation(name, remapper.mapDesc(desc));
return v == null ? null : (v == av ? this : new AnnotationRemapper(api, v, remapper));
}
......
......@@ -85,7 +85,7 @@ public class ClassRemapper extends ClassVisitor {
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
AnnotationVisitor av = super.visitAnnotation(remapper.mapType(desc), visible);
AnnotationVisitor av = super.visitAnnotation(remapper.mapDesc(desc), visible);
return av == null ? null : createAnnotationRemapper(av);
}
......
......@@ -53,7 +53,7 @@ public class FieldRemapper extends FieldVisitor {
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
AnnotationVisitor av = fv.visitAnnotation(remapper.mapType(desc), visible);
AnnotationVisitor av = fv.visitAnnotation(remapper.mapDesc(desc), visible);
return av == null ? null : new AnnotationRemapper(api, av, remapper);
}
......
......@@ -61,7 +61,7 @@ public class MethodRemapper extends MethodVisitor {
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
AnnotationVisitor av = super.visitAnnotation(remapper.mapType(desc), visible);
AnnotationVisitor av = super.visitAnnotation(remapper.mapDesc(desc), visible);
return av == null ? av : new AnnotationRemapper(api, av, remapper);
}
......@@ -76,7 +76,7 @@ public class MethodRemapper extends MethodVisitor {
@Override
public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
AnnotationVisitor av =
super.visitParameterAnnotation(parameter, remapper.mapType(desc), visible);
super.visitParameterAnnotation(parameter, remapper.mapDesc(desc), visible);
return av == null ? av : new AnnotationRemapper(api, av, remapper);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment