Add a builder-style utility class for injecting static method invocation instructions #132
Conversation
gnemyk
changed the title
|
|
Certainly. Done, and rebased. |
| private int initOffset = -1; | ||
|
|
||
| public int getConstructorCallOffset() { | ||
| assert initOffset != -1 |
There was a problem hiding this comment.
why so many asserts?
There was a problem hiding this comment.
This is to prevent requesting for the results (i.e., offset) before this visitor has a chance to visit any methods
base/src/main/java/proguard/classfile/util/ConstructorInvocationOffsetFinder.java
Show resolved
Hide resolved
| new InternalTypeEnumeration(method.getDescriptor(clazz)); | ||
| Iterator<InjectedArgument> argumentsIterator = Arrays.stream(arguments).iterator(); | ||
|
|
||
| while (parametersIterator.hasNext() || argumentsIterator.hasNext()) { |
There was a problem hiding this comment.
| while (parametersIterator.hasNext() || argumentsIterator.hasNext()) { | |
| while (parametersIterator.hasNext() && argumentsIterator.hasNext()) { |
Shouldnt this be an && to be safe? If somehow we erroneously have a difference in the size of parameters and arguments the next call would fail. Maybe we can properly handle that though.
There was a problem hiding this comment.
The || is rather intentional. Suppose we the parameterIterator and argumentsIterator has different length, we would fall through this loop so long the first part matche If we used &&. With ||, we can prevent this.
| @Override | ||
| public void visitCodeAttribute( | ||
| Clazz clazz, Method method, CodeAttribute codeAttribute) { | ||
| editor.reset(codeAttribute.u4codeLength); |
There was a problem hiding this comment.
this is more of a style preference, so consider this as a nit: I prefer this to be an explicit class even if it's only used here
Add an api for injecting a call to any static methods (with or without parameters) into the first block of any target methods.
gnemyk
force-pushed
the
static-invoke-injector
branch
from
2e3f84a to
392a1f1
Compare
| @@ -0,0 +1,107 @@ | |||
| package proguard.classfile.util; | |||
|
|
|||
| import proguard.classfile.*; | |||
Add an api for injecting a call to any static methods (with or without parameters) into the first block of any target methods.