Skip to content

Commit 37b512a

Browse files
committed
fix hidden methods for java 11+
1 parent 28ffdb0 commit 37b512a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

obfuscator/src/main/java/by/radioegor146/instructions/MethodHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected void process(MethodContext context, MethodInsnNode node) {
9090
.getMethod("invokereverse", methodDesc, method -> {
9191
method.visibleAnnotations = new ArrayList<>();
9292
method.visibleAnnotations.add(new AnnotationNode("Ljava/lang/invoke/LambdaForm$Hidden;"));
93-
method.visibleAnnotations.add(new AnnotationNode("Ljdk/internal/vm/annotation/LambdaForm$Hidden;"));
93+
method.visibleAnnotations.add(new AnnotationNode("Ljdk/internal/vm/annotation/Hidden;"));
9494
int methodHandleIndex = 0;
9595
for (Type argument : Type.getArgumentTypes(mhDesc)) {
9696
methodHandleIndex += argument.getSize();
@@ -129,7 +129,7 @@ protected void process(MethodContext context, MethodInsnNode node) {
129129
.getMethod("mhinvoke", methodDesc, method -> {
130130
method.visibleAnnotations = new ArrayList<>();
131131
method.visibleAnnotations.add(new AnnotationNode("Ljava/lang/invoke/LambdaForm$Hidden;"));
132-
method.visibleAnnotations.add(new AnnotationNode("Ljdk/internal/vm/annotation/LambdaForm$Hidden;"));
132+
method.visibleAnnotations.add(new AnnotationNode("Ljdk/internal/vm/annotation/Hidden;"));
133133
method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
134134
int index = 1;
135135
for (Type argument : Type.getArgumentTypes(mhDesc)) {

obfuscator/src/main/java/by/radioegor146/special/ClInitSpecialMethodProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public String preProcess(MethodContext context) {
2020
methodNode.access = Opcodes.ACC_NATIVE | Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE;
2121
methodNode.visibleAnnotations = new ArrayList<>();
2222
methodNode.visibleAnnotations.add(new AnnotationNode("Ljava/lang/invoke/LambdaForm$Hidden;"));
23-
methodNode.visibleAnnotations.add(new AnnotationNode("Ljdk/internal/vm/annotation/LambdaForm$Hidden;"));
23+
methodNode.visibleAnnotations.add(new AnnotationNode("Ljdk/internal/vm/annotation/Hidden;"));
2424
});
2525
return name;
2626
}

obfuscator/src/main/java/by/radioegor146/special/DefaultSpecialMethodProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public String preProcess(MethodContext context) {
2727
methodNode.access = Opcodes.ACC_NATIVE | Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE;
2828
methodNode.visibleAnnotations = new ArrayList<>();
2929
methodNode.visibleAnnotations.add(new AnnotationNode("Ljava/lang/invoke/LambdaForm$Hidden;"));
30-
methodNode.visibleAnnotations.add(new AnnotationNode("Ljdk/internal/vm/annotation/LambdaForm$Hidden;"));
30+
methodNode.visibleAnnotations.add(new AnnotationNode("Ljdk/internal/vm/annotation/Hidden;"));
3131
});
3232
return methodName;
3333
}

0 commit comments

Comments
 (0)