Unreferenced class detection #598
Conversation
| private void addClasses(String descriptor) { | ||
| MatchIterator it = TYPE_PATTERN.matcher(descriptor).findAll(); | ||
| if (!it.hasMore()) return; | ||
| while (it.hasMore()) { |
There was a problem hiding this comment.
Can use ASM's Type class to parse this more efficiently.
Also, further down in this review I have a suggestion which will ensure only single-value descriptors (no method descriptors) will be passed in here. This should actually let us be even quicker by doing descriptor.substring(1, descriptor.length() - 1) assuming the descriptor is an object type. We can check by: descriptor.size() > 2 && descriptor.charAt(0) == 'L'
|
|
||
| @Override | ||
| public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) { | ||
| types.add(descriptor); |
There was a problem hiding this comment.
This will be things like (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Lorg/objectweb/asm/MethodVisitor;
We can sanitize our input such that types never has method types to make handling values simpler later.
Using ASM's Type class we can parse the method descriptor and add each parameter type & return value.
| return new TypeCollectionMethodVisitor(types, methodVisitor); | ||
| } | ||
|
|
||
| return super.visitMethod(access, name, descriptor, signature, exceptions); |
There was a problem hiding this comment.
If shouldVisitMethods is false we can return null to skip over some data that won't be looked at.
| @Override | ||
| public AnnotationVisitor visitTryCatchAnnotation(int typeRef, TypePath typePath, String descriptor, boolean visible) { | ||
| types.add(descriptor); | ||
| return super.visitTryCatchAnnotation(typeRef, typePath, descriptor, visible); |
There was a problem hiding this comment.
May want to also create an annotation visitor. For example @MyAnno(myEnumValue = Foo.VALUE_FOO) may be the only case where the type Foo is referenced.
| @Override | ||
| public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) { | ||
| types.add(owner); | ||
| types.add(descriptor); |
There was a problem hiding this comment.
Same thing as described before with adding only single values to types rather than whole method descriptors.
Applies to invokedynamic too.
| @@ -52,7 +53,7 @@ protected void onRead(ContentCollection collection) throws IOException { | |||
| try { | |||
| if (isParsableClass(bytes)) { | |||
| // Class can be parsed, record it as a class | |||
| ClassInfo clazz = ClassInfo.read(bytes); | |||
| ClassInfo clazz = ClassInfo.read(bytes, ClassSourceType.PRIMARY); | |||
There was a problem hiding this comment.
I do not think we cannot assume this is a library at this point. For instance, how would we differentiate between when the user drops a jar in and chooses "add as library" instead of opening a new workspace?
recaf-core/src/test/java/me/coley/recaf/analysis/AnalysisTests.java
Outdated
Show resolved
Hide resolved
recaf-ui/src/main/java/me/coley/recaf/ui/control/code/java/JavaArea.java
Outdated
Show resolved
Hide resolved
recaf-ui/src/main/java/me/coley/recaf/ui/dialog/SsvmOptimizeDialog.java
Outdated
Show resolved
Hide resolved
…ning # Conflicts: # recaf-core/src/main/java/me/coley/recaf/Services.java # recaf-core/src/main/java/me/coley/recaf/code/ClassInfo.java # recaf-core/src/main/java/me/coley/recaf/workspace/resource/RuntimeResource.java # recaf-ui/src/main/java/me/coley/recaf/ui/control/code/bytecode/AssemblerArea.java
What's new