Skip to content

Add signature annotations #1

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

Open
mernst wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add signature annotations #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
36e63f0
Add annotations
mernst Oct 11, 2024
cfb1266
Comment out retrofitting
mernst Oct 14, 2024
1a71b61
Merge ../asm-fork-ow2 into build
mernst Jan 6, 2025
9d0cb9a
Add type qualifiers
mernst Jan 7, 2025
1b89f83
Add type qualifiers
mernst Jan 11, 2025
a367318
Checkpoint
mernst Apr 14, 2025
3f1f01b
Merge ../asm-fork-typetools into build
mernst Dec 21, 2025
cbbebbe
Add imports
mernst Jan 2, 2026
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
Next Next commit
Add annotations
  • Loading branch information
@mernst
mernst committed Oct 11, 2024
commit 36e63f0a974966f7fcb06e6bedc67fb6172dbb0d
8 changes: 4 additions & 4 deletions asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/Analyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public Analyzer(final Interpreter<V> interpreter) {
* @throws AnalyzerException if a problem occurs during the analysis.
*/
@SuppressWarnings("unchecked")
public Frame<V>[] analyze(final String owner, final MethodNode method) throws AnalyzerException {
public Frame<V>[] analyze(final @InternalForm String owner, final MethodNode method) throws AnalyzerException {
if ((method.access & (ACC_ABSTRACT | ACC_NATIVE)) != 0) {
frames = (Frame<V>[]) new Frame<?>[0];
return frames;
Expand Down Expand Up @@ -307,7 +307,7 @@ public Frame<V>[] analyze(final String owner, final MethodNode method) throws An
* instruction cannot be reached (dead code).
* @throws AnalyzerException if a problem occurs during the analysis.
*/
public Frame<V>[] analyzeAndComputeMaxs(final String owner, final MethodNode method)
public Frame<V>[] analyzeAndComputeMaxs(final @InternalForm String owner, final MethodNode method)
throws AnalyzerException {
method.maxLocals = computeMaxLocals(method);
method.maxStack = -1;
Expand Down Expand Up @@ -492,7 +492,7 @@ private void findSubroutine(
* @param method the method to be analyzed.
* @return the initial execution stack frame of the 'method'.
*/
private Frame<V> computeInitialFrame(final String owner, final MethodNode method) {
private Frame<V> computeInitialFrame(final @InternalForm String owner, final MethodNode method) {
Frame<V> frame = newFrame(method.maxLocals, method.maxStack);
int currentLocal = 0;
boolean isInstanceMethod = (method.access & ACC_STATIC) == 0;
Expand Down Expand Up @@ -552,7 +552,7 @@ public List<TryCatchBlockNode> getHandlers(final int insnIndex) {
* @param method the method to be analyzed.
* @throws AnalyzerException if a problem occurs.
*/
protected void init(final String owner, final MethodNode method) throws AnalyzerException {
protected void init(final @InternalForm String owner, final MethodNode method) throws AnalyzerException {
// Nothing to do.
}

Expand Down
2 changes: 1 addition & 1 deletion asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/MethodNodeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ MethodNodeBuilder typeInsn(final int opcode, final String operand) {

MethodNodeBuilder methodInsn(
final int opcode,
final String owner,
final @InternalForm String owner,
final String name,
final String descriptor,
final boolean isInterface) {
Expand Down
2 changes: 1 addition & 1 deletion asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/SimpleVerifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void testConstructor() {
"java/util/Map, java/util/List, java/lang/Object"
})
void testMerge_objectTypes(
final String internalName1, final String internalName2, final String expectedInternalName) {
final @InternalForm String internalName1, final @InternalForm String internalName2, final @InternalForm String expectedInternalName) {
BasicValue value1 = new BasicValue(Type.getObjectType(internalName1));
BasicValue value2 = new BasicValue(Type.getObjectType(internalName2));
SimpleVerifier verifier = new SimpleVerifier();
Expand Down
12 changes: 6 additions & 6 deletions asm-commons/src/main/java/org/objectweb/asm/commons/AdviceAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ public void visitVarInsn(final int opcode, final int varIndex) {

@Override
public void visitFieldInsn(
final int opcode, final String owner, final String name, final String descriptor) {
final int opcode, final @InternalForm String owner, final @Identifier String name, final @FieldDescriptor String descriptor) {
super.visitFieldInsn(opcode, owner, name, descriptor);
if (isConstructor && !superClassConstructorCalled) {
char firstDescriptorChar = descriptor.charAt(0);
Expand Down Expand Up @@ -422,7 +422,7 @@ public void visitLdcInsn(final Object value) {
}

@Override
public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) {
public void visitMultiANewArrayInsn(final @FieldDescriptor String descriptor, final int numDimensions) {
super.visitMultiANewArrayInsn(descriptor, numDimensions);
if (isConstructor && !superClassConstructorCalled) {
for (int i = 0; i < numDimensions; i++) {
Expand All @@ -433,7 +433,7 @@ public void visitMultiANewArrayInsn(final String descriptor, final int numDimens
}

@Override
public void visitTypeInsn(final int opcode, final String type) {
public void visitTypeInsn(final int opcode, final @InternalForm String type) {
super.visitTypeInsn(opcode, type);
// ANEWARRAY, CHECKCAST or INSTANCEOF don't change stack.
if (isConstructor && !superClassConstructorCalled && opcode == NEW) {
Expand All @@ -444,8 +444,8 @@ public void visitTypeInsn(final int opcode, final String type) {
@Override
public void visitMethodInsn(
final int opcodeAndSource,
final String owner,
final String name,
final @InternalForm String owner,
final @Identifier String name,
final String descriptor,
final boolean isInterface) {
if (api < Opcodes.ASM5 && (opcodeAndSource & Opcodes.SOURCE_DEPRECATED) == 0) {
Expand Down Expand Up @@ -567,7 +567,7 @@ public void visitTableSwitchInsn(

@Override
public void visitTryCatchBlock(
final Label start, final Label end, final Label handler, final String type) {
final Label start, final Label end, final Label handler, final @InternalForm String type) {
super.visitTryCatchBlock(start, end, handler, type);
// By definition of 'forwardJumpStackFrames', 'handler' should be pushed only if there is an
// instruction between 'start' and 'end' at which the super class constructor is not yet
Expand Down
16 changes: 8 additions & 8 deletions asm-commons/src/main/java/org/objectweb/asm/commons/AnalyzerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public class AnalyzerAdapter extends MethodVisitor {
private int maxLocals;

/** The owner's class name. */
private String owner;
private @InternalForm String owner;

/**
* Constructs a new {@link AnalyzerAdapter}. <i>Subclasses must not use this constructor</i>.
Expand All @@ -113,7 +113,7 @@ public class AnalyzerAdapter extends MethodVisitor {
* @throws IllegalStateException If a subclass calls this constructor.
*/
public AnalyzerAdapter(
final String owner,
final @InternalForm String owner,
final int access,
final String name,
final String descriptor,
Expand All @@ -138,7 +138,7 @@ public AnalyzerAdapter(
*/
protected AnalyzerAdapter(
final int api,
final String owner,
final @InternalForm String owner,
final int access,
final String name,
final String descriptor,
Expand Down Expand Up @@ -256,7 +256,7 @@ public void visitVarInsn(final int opcode, final int varIndex) {
}

@Override
public void visitTypeInsn(final int opcode, final String type) {
public void visitTypeInsn(final int opcode, final @InternalForm String type) {
if (opcode == Opcodes.NEW) {
if (labels == null) {
Label label = new Label();
Expand All @@ -276,16 +276,16 @@ public void visitTypeInsn(final int opcode, final String type) {

@Override
public void visitFieldInsn(
final int opcode, final String owner, final String name, final String descriptor) {
final int opcode, final @InternalForm String owner, final @Identifier String name, final @FieldDescriptor String descriptor) {
super.visitFieldInsn(opcode, owner, name, descriptor);
execute(opcode, 0, descriptor);
}

@Override
public void visitMethodInsn(
final int opcodeAndSource,
final String owner,
final String name,
final @InternalForm String owner,
final @Identifier String name,
final String descriptor,
final boolean isInterface) {
if (api < Opcodes.ASM5 && (opcodeAndSource & Opcodes.SOURCE_DEPRECATED) == 0) {
Expand Down Expand Up @@ -424,7 +424,7 @@ public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Labe
}

@Override
public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) {
public void visitMultiANewArrayInsn(final @FieldDescriptor String descriptor, final int numDimensions) {
super.visitMultiANewArrayInsn(descriptor, numDimensions);
execute(Opcodes.MULTIANEWARRAY, numDimensions, descriptor);
}
Expand Down
24 changes: 12 additions & 12 deletions asm-commons/src/main/java/org/objectweb/asm/commons/ClassRemapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class ClassRemapper extends ClassVisitor {
protected final Remapper remapper;

/** The internal name of the visited class. */
protected String className;
protected @InternalForm String className;

/**
* Constructs a new {@link ClassRemapper}. <i>Subclasses must not use this constructor</i>.
Expand Down Expand Up @@ -94,10 +94,10 @@ protected ClassRemapper(final int api, final ClassVisitor classVisitor, final Re
public void visit(
final int version,
final int access,
final String name,
final @InternalForm String name,
final String signature,
final String superName,
final String[] interfaces) {
final @InternalForm String superName,
final @InternalForm String @Nullable [] interfaces) {
this.className = name;
super.visit(
version,
Expand Down Expand Up @@ -161,8 +161,8 @@ public RecordComponentVisitor visitRecordComponent(
@Override
public FieldVisitor visitField(
final int access,
final String name,
final String descriptor,
final @Identifier String name,
final @FieldDescriptor String descriptor,
final String signature,
final Object value) {
FieldVisitor fieldVisitor =
Expand All @@ -181,7 +181,7 @@ public MethodVisitor visitMethod(
final String name,
final String descriptor,
final String signature,
final String[] exceptions) {
final @InternalForm String @Nullable [] exceptions) {
String remappedDescriptor = remapper.mapMethodDesc(descriptor);
MethodVisitor methodVisitor =
super.visitMethod(
Expand All @@ -195,7 +195,7 @@ public MethodVisitor visitMethod(

@Override
public void visitInnerClass(
final String name, final String outerName, final String innerName, final int access) {
final @InternalForm String name, final @InternalForm String outerName, final @Identifier String innerName, final int access) {
super.visitInnerClass(
remapper.mapType(name),
outerName == null ? null : remapper.mapType(outerName),
Expand All @@ -204,25 +204,25 @@ public void visitInnerClass(
}

@Override
public void visitOuterClass(final String owner, final String name, final String descriptor) {
public void visitOuterClass(final @InternalForm String owner, final @Nullable @Identifier String name, final String descriptor) {
super.visitOuterClass(
remapper.mapType(owner),
name == null ? null : remapper.mapMethodName(owner, name, descriptor),
descriptor == null ? null : remapper.mapMethodDesc(descriptor));
}

@Override
public void visitNestHost(final String nestHost) {
public void visitNestHost(final @InternalForm String nestHost) {
super.visitNestHost(remapper.mapType(nestHost));
}

@Override
public void visitNestMember(final String nestMember) {
public void visitNestMember(final @InternalForm String nestMember) {
super.visitNestMember(remapper.mapType(nestMember));
}

@Override
public void visitPermittedSubclass(final String permittedSubclass) {
public void visitPermittedSubclass(final @InternalForm String permittedSubclass) {
super.visitPermittedSubclass(remapper.mapType(permittedSubclass));
}

Expand Down
10 changes: 5 additions & 5 deletions asm-commons/src/main/java/org/objectweb/asm/commons/CodeSizeEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ public void visitVarInsn(final int opcode, final int varIndex) {
}

@Override
public void visitTypeInsn(final int opcode, final String type) {
public void visitTypeInsn(final int opcode, final @InternalForm String type) {
minSize += 3;
maxSize += 3;
super.visitTypeInsn(opcode, type);
}

@Override
public void visitFieldInsn(
final int opcode, final String owner, final String name, final String descriptor) {
final int opcode, final @InternalForm String owner, final @Identifier String name, final @FieldDescriptor String descriptor) {
minSize += 3;
maxSize += 3;
super.visitFieldInsn(opcode, owner, name, descriptor);
Expand All @@ -114,8 +114,8 @@ public void visitFieldInsn(
@Override
public void visitMethodInsn(
final int opcodeAndSource,
final String owner,
final String name,
final @InternalForm String owner,
final @Identifier String name,
final String descriptor,
final boolean isInterface) {
if (api < Opcodes.ASM5 && (opcodeAndSource & Opcodes.SOURCE_DEPRECATED) == 0) {
Expand Down Expand Up @@ -199,7 +199,7 @@ public void visitLookupSwitchInsn(final Label dflt, final int[] keys, final Labe
}

@Override
public void visitMultiANewArrayInsn(final String descriptor, final int numDimensions) {
public void visitMultiANewArrayInsn(final @FieldDescriptor String descriptor, final int numDimensions) {
minSize += 4;
maxSize += 4;
super.visitMultiANewArrayInsn(descriptor, numDimensions);
Expand Down
6 changes: 3 additions & 3 deletions asm-commons/src/main/java/org/objectweb/asm/commons/GeneratorAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ public GeneratorAdapter(
* @param types a set of types.
* @return the internal names of the given types (see {@link Type#getInternalName()}).
*/
private static String[] getInternalNames(final Type[] types) {
private static @InternalForm String[] getInternalNames(final Type[] types) {
String[] names = new String[types.length];
for (int i = 0; i < names.length; ++i) {
names[i] = types[i].getInternalName();
Expand Down Expand Up @@ -1186,7 +1186,7 @@ public void putField(final Type owner, final String name, final Type type) {
*/
private void invokeInsn(
final int opcode, final Type type, final Method method, final boolean isInterface) {
String owner = type.getSort() == Type.ARRAY ? type.getDescriptor() : type.getInternalName();
@InternalForm String owner = type.getSort() == Type.ARRAY ? type.getDescriptor() : type.getInternalName();
mv.visitMethodInsn(opcode, owner, method.getName(), method.getDescriptor(), isInterface);
}

Expand Down Expand Up @@ -1357,7 +1357,7 @@ public void endMethod() {
*
* @param start beginning of the exception handler's scope (inclusive).
* @param end end of the exception handler's scope (exclusive).
* @param exception internal name of the type of exceptions handled by the handler (see {@link
* @param exception the type of exceptions handled by the handler (see {@link
* Type#getInternalName()}).
*/
public void catchException(final Label start, final Label end, final Type exception) {
Expand Down
Loading