aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.xml9
-rw-r--r--common.xml7
-rw-r--r--core/src/com/google/inject/internal/util/LineNumbers.java107
-rw-r--r--extensions/persist/lib/cglib-nodep-2.2.jarbin322362 -> 0 bytes
-rw-r--r--extensions/persist/lib/cglib-nodep-3.0.jarbin0 -> 329751 bytes
-rw-r--r--lib/build/asm-3.3.1.jarbin43579 -> 0 bytes
-rw-r--r--lib/build/asm-4.0.jarbin0 -> 46018 bytes
-rw-r--r--lib/build/asm-util-4.0.jarbin0 -> 36993 bytes
-rw-r--r--lib/build/cglib-2.2.2.jarbin287192 -> 0 bytes
-rw-r--r--lib/build/cglib-3.0.jarbin0 -> 282959 bytes
10 files changed, 39 insertions, 84 deletions
diff --git a/build.xml b/build.xml
index b499839b..16e63df5 100644
--- a/build.xml
+++ b/build.xml
@@ -236,13 +236,16 @@
<arg value="-DNO_AOP" />
</munge>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-3.3.1.jar"/>]]></replacetoken>
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-4.0.jar"/>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar"/>]]></replacetoken>
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-util-4.0.jar"/>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar">
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar"/>]]></replacetoken>
+ </replace>
+ <replace file="build/no_aop/common.xml" value="">
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar">
<include name="LICENSE"/>
<include name="NOTICE"/>
</zipfileset>]]></replacetoken>
diff --git a/common.xml b/common.xml
index 943d3851..11024812 100644
--- a/common.xml
+++ b/common.xml
@@ -148,8 +148,9 @@
classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
<fileset dir="${build.dir}/classes"/>
- <zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar"/>
- <zipfileset src="${common.basedir}/lib/build/asm-3.3.1.jar"/>
+ <zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar"/>
+ <zipfileset src="${common.basedir}/lib/build/asm-4.0.jar"/>
+ <zipfileset src="${common.basedir}/lib/build/asm-util-4.0.jar"/>
<zipfileset src="${common.basedir}/lib/build/guava-11.0.1.jar"/>
<rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
<rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
@@ -171,7 +172,7 @@
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
- <zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar">
+ <zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar">
<include name="LICENSE"/>
<include name="NOTICE"/>
</zipfileset>
diff --git a/core/src/com/google/inject/internal/util/LineNumbers.java b/core/src/com/google/inject/internal/util/LineNumbers.java
index 227c81e7..e24b87bb 100644
--- a/core/src/com/google/inject/internal/util/LineNumbers.java
+++ b/core/src/com/google/inject/internal/util/LineNumbers.java
@@ -22,7 +22,6 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.Attribute;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.FieldVisitor;
@@ -123,12 +122,16 @@ final class LineNumbers {
end[NO_AOP]*/
}
- private class LineNumberReader implements ClassVisitor, MethodVisitor, AnnotationVisitor {
+ private class LineNumberReader extends ClassVisitor {
private int line = -1;
private String pendingMethod;
private String name;
+ LineNumberReader() {
+ super(Opcodes.ASM4);
+ }
+
public void visit(int version, int access, String name, String signature,
String superName, String[] interfaces) {
this.name = name;
@@ -141,7 +144,7 @@ final class LineNumbers {
}
pendingMethod = name + desc;
line = -1;
- return this;
+ return new LineNumberMethodVisitor();
}
public void visitSource(String source, String debug) {
@@ -160,113 +163,61 @@ final class LineNumbers {
}
}
- public void visitFieldInsn(int opcode, String owner, String name,
- String desc) {
- if (opcode == Opcodes.PUTFIELD && this.name.equals(owner)
- && !lines.containsKey(name) && line != -1) {
- lines.put(name, line);
- }
- }
-
- public void visitEnd() {
- }
-
- public void visitInnerClass(String name, String outerName, String innerName,
- int access) {
- }
-
- public void visitOuterClass(String owner, String name, String desc) {
- }
-
- public void visitAttribute(Attribute attr) {
- }
-
public FieldVisitor visitField(int access, String name, String desc,
String signature, Object value) {
return null;
}
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
- return this;
- }
-
- public AnnotationVisitor visitAnnotation(String name, String desc) {
- return this;
- }
-
- public AnnotationVisitor visitAnnotationDefault() {
- return this;
+ return new LineNumberAnnotationVisitor();
}
public AnnotationVisitor visitParameterAnnotation(int parameter,
String desc, boolean visible) {
- return this;
+ return new LineNumberAnnotationVisitor();
}
- public AnnotationVisitor visitArray(String name) {
- return this;
+ class LineNumberMethodVisitor extends MethodVisitor {
+ LineNumberMethodVisitor() {
+ super(Opcodes.ASM4);
}
- public void visitEnum(String name, String desc, String value) {
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+ return new LineNumberAnnotationVisitor();
}
- public void visit(String name, Object value) {
+ public AnnotationVisitor visitAnnotationDefault() {
+ return new LineNumberAnnotationVisitor();
}
- public void visitCode() {
+ public void visitFieldInsn(int opcode, String owner, String name,
+ String desc) {
+ if (opcode == Opcodes.PUTFIELD && LineNumberReader.this.name.equals(owner)
+ && !lines.containsKey(name) && line != -1) {
+ lines.put(name, line);
}
-
- public void visitFrame(int type, int nLocal, Object[] local, int nStack,
- Object[] stack) {
}
- public void visitIincInsn(int var, int increment) {
+ public void visitLineNumber(int line, Label start) {
+ LineNumberReader.this.visitLineNumber(line, start);
}
-
- public void visitInsn(int opcode) {
}
- public void visitIntInsn(int opcode, int operand) {
+ class LineNumberAnnotationVisitor extends AnnotationVisitor {
+ LineNumberAnnotationVisitor() {
+ super(Opcodes.ASM4);
}
-
- public void visitJumpInsn(int opcode, Label label) {
+ public AnnotationVisitor visitAnnotation(String name, String desc) {
+ return this;
}
-
- public void visitLabel(Label label) {
+ public AnnotationVisitor visitArray(String name) {
+ return this;
}
-
- public void visitLdcInsn(Object cst) {
- }
-
public void visitLocalVariable(String name, String desc, String signature,
Label start, Label end, int index) {
}
- public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
- }
-
- public void visitMaxs(int maxStack, int maxLocals) {
- }
-
- public void visitMethodInsn(int opcode, String owner, String name,
- String desc) {
}
- public void visitMultiANewArrayInsn(String desc, int dims) {
- }
-
- public void visitTableSwitchInsn(int min, int max, Label dflt,
- Label[] labels) {
- }
-
- public void visitTryCatchBlock(Label start, Label end, Label handler,
- String type) {
- }
-
- public void visitTypeInsn(int opcode, String desc) {
- }
-
- public void visitVarInsn(int opcode, int var) {
- }
}
}
diff --git a/extensions/persist/lib/cglib-nodep-2.2.jar b/extensions/persist/lib/cglib-nodep-2.2.jar
deleted file mode 100644
index ed07cb50..00000000
--- a/extensions/persist/lib/cglib-nodep-2.2.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/persist/lib/cglib-nodep-3.0.jar b/extensions/persist/lib/cglib-nodep-3.0.jar
new file mode 100644
index 00000000..1f761af6
--- /dev/null
+++ b/extensions/persist/lib/cglib-nodep-3.0.jar
Binary files differ
diff --git a/lib/build/asm-3.3.1.jar b/lib/build/asm-3.3.1.jar
deleted file mode 100644
index 349f0d42..00000000
--- a/lib/build/asm-3.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/lib/build/asm-4.0.jar b/lib/build/asm-4.0.jar
new file mode 100644
index 00000000..6d63075e
--- /dev/null
+++ b/lib/build/asm-4.0.jar
Binary files differ
diff --git a/lib/build/asm-util-4.0.jar b/lib/build/asm-util-4.0.jar
new file mode 100644
index 00000000..0e105958
--- /dev/null
+++ b/lib/build/asm-util-4.0.jar
Binary files differ
diff --git a/lib/build/cglib-2.2.2.jar b/lib/build/cglib-2.2.2.jar
deleted file mode 100644
index 564b9f88..00000000
--- a/lib/build/cglib-2.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/lib/build/cglib-3.0.jar b/lib/build/cglib-3.0.jar
new file mode 100644
index 00000000..c4199f31
--- /dev/null
+++ b/lib/build/cglib-3.0.jar
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 20:42:40 +0000