Skip to content

Commit 2303007

Browse files
committed
Upgrade to cglib 3.0 adn ASM 4.0.
------------------ Manually synced. COMMIT=35272017
1 parent e5ed5b4 commit 2303007

File tree

10 files changed

+39
-84
lines changed

10 files changed

+39
-84
lines changed

build.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,16 @@
236236
<arg value="-DNO_AOP" />
237237
</munge>
238238
<replace file="build/no_aop/common.xml" value="">
239-
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-3.3.1.jar"/>]]></replacetoken>
239+
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-4.0.jar"/>]]></replacetoken>
240240
</replace>
241241
<replace file="build/no_aop/common.xml" value="">
242-
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar"/>]]></replacetoken>
242+
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-util-4.0.jar"/>]]></replacetoken>
243243
</replace>
244244
<replace file="build/no_aop/common.xml" value="">
245-
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar">
245+
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar"/>]]></replacetoken>
246+
</replace>
247+
<replace file="build/no_aop/common.xml" value="">
248+
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar">
246249
<include name="LICENSE"/>
247250
<include name="NOTICE"/>
248251
</zipfileset>]]></replacetoken>

common.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,9 @@
148148
classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
149149
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
150150
<fileset dir="${build.dir}/classes"/>
151-
<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar"/>
152-
<zipfileset src="${common.basedir}/lib/build/asm-3.3.1.jar"/>
151+
<zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar"/>
152+
<zipfileset src="${common.basedir}/lib/build/asm-4.0.jar"/>
153+
<zipfileset src="${common.basedir}/lib/build/asm-util-4.0.jar"/>
153154
<zipfileset src="${common.basedir}/lib/build/guava-11.0.1.jar"/>
154155
<rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
155156
<rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
@@ -171,7 +172,7 @@
171172
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
172173
classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
173174
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
174-
<zipfileset src="${common.basedir}/lib/build/cglib-2.2.2.jar">
175+
<zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar">
175176
<include name="LICENSE"/>
176177
<include name="NOTICE"/>
177178
</zipfileset>

core/src/com/google/inject/internal/util/LineNumbers.java

Lines changed: 29 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.common.collect.Maps;
2323

2424
import org.objectweb.asm.AnnotationVisitor;
25-
import org.objectweb.asm.Attribute;
2625
import org.objectweb.asm.ClassReader;
2726
import org.objectweb.asm.ClassVisitor;
2827
import org.objectweb.asm.FieldVisitor;
@@ -123,12 +122,16 @@ private String memberKey(Member member) {
123122
end[NO_AOP]*/
124123
}
125124

126-
private class LineNumberReader implements ClassVisitor, MethodVisitor, AnnotationVisitor {
125+
private class LineNumberReader extends ClassVisitor {
127126

128127
private int line = -1;
129128
private String pendingMethod;
130129
private String name;
131130

131+
LineNumberReader() {
132+
super(Opcodes.ASM4);
133+
}
134+
132135
public void visit(int version, int access, String name, String signature,
133136
String superName, String[] interfaces) {
134137
this.name = name;
@@ -141,7 +144,7 @@ public MethodVisitor visitMethod(int access, String name, String desc,
141144
}
142145
pendingMethod = name + desc;
143146
line = -1;
144-
return this;
147+
return new LineNumberMethodVisitor();
145148
}
146149

147150
public void visitSource(String source, String debug) {
@@ -160,113 +163,61 @@ public void visitLineNumber(int line, Label start) {
160163
}
161164
}
162165

163-
public void visitFieldInsn(int opcode, String owner, String name,
164-
String desc) {
165-
if (opcode == Opcodes.PUTFIELD && this.name.equals(owner)
166-
&& !lines.containsKey(name) && line != -1) {
167-
lines.put(name, line);
168-
}
169-
}
170-
171-
public void visitEnd() {
172-
}
173-
174-
public void visitInnerClass(String name, String outerName, String innerName,
175-
int access) {
176-
}
177-
178-
public void visitOuterClass(String owner, String name, String desc) {
179-
}
180-
181-
public void visitAttribute(Attribute attr) {
182-
}
183-
184166
public FieldVisitor visitField(int access, String name, String desc,
185167
String signature, Object value) {
186168
return null;
187169
}
188170

189171
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
190-
return this;
191-
}
192-
193-
public AnnotationVisitor visitAnnotation(String name, String desc) {
194-
return this;
195-
}
196-
197-
public AnnotationVisitor visitAnnotationDefault() {
198-
return this;
172+
return new LineNumberAnnotationVisitor();
199173
}
200174

201175
public AnnotationVisitor visitParameterAnnotation(int parameter,
202176
String desc, boolean visible) {
203-
return this;
177+
return new LineNumberAnnotationVisitor();
204178
}
205179

206-
public AnnotationVisitor visitArray(String name) {
207-
return this;
180+
class LineNumberMethodVisitor extends MethodVisitor {
181+
LineNumberMethodVisitor() {
182+
super(Opcodes.ASM4);
208183
}
209184

210-
public void visitEnum(String name, String desc, String value) {
185+
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
186+
return new LineNumberAnnotationVisitor();
211187
}
212188

213-
public void visit(String name, Object value) {
189+
public AnnotationVisitor visitAnnotationDefault() {
190+
return new LineNumberAnnotationVisitor();
214191
}
215192

216-
public void visitCode() {
193+
public void visitFieldInsn(int opcode, String owner, String name,
194+
String desc) {
195+
if (opcode == Opcodes.PUTFIELD && LineNumberReader.this.name.equals(owner)
196+
&& !lines.containsKey(name) && line != -1) {
197+
lines.put(name, line);
217198
}
218-
219-
public void visitFrame(int type, int nLocal, Object[] local, int nStack,
220-
Object[] stack) {
221199
}
222200

223-
public void visitIincInsn(int var, int increment) {
201+
public void visitLineNumber(int line, Label start) {
202+
LineNumberReader.this.visitLineNumber(line, start);
224203
}
225-
226-
public void visitInsn(int opcode) {
227204
}
228205

229-
public void visitIntInsn(int opcode, int operand) {
206+
class LineNumberAnnotationVisitor extends AnnotationVisitor {
207+
LineNumberAnnotationVisitor() {
208+
super(Opcodes.ASM4);
230209
}
231-
232-
public void visitJumpInsn(int opcode, Label label) {
210+
public AnnotationVisitor visitAnnotation(String name, String desc) {
211+
return this;
233212
}
234-
235-
public void visitLabel(Label label) {
213+
public AnnotationVisitor visitArray(String name) {
214+
return this;
236215
}
237-
238-
public void visitLdcInsn(Object cst) {
239-
}
240-
241216
public void visitLocalVariable(String name, String desc, String signature,
242217
Label start, Label end, int index) {
243218
}
244219

245-
public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
246-
}
247-
248-
public void visitMaxs(int maxStack, int maxLocals) {
249-
}
250-
251-
public void visitMethodInsn(int opcode, String owner, String name,
252-
String desc) {
253220
}
254221

255-
public void visitMultiANewArrayInsn(String desc, int dims) {
256-
}
257-
258-
public void visitTableSwitchInsn(int min, int max, Label dflt,
259-
Label[] labels) {
260-
}
261-
262-
public void visitTryCatchBlock(Label start, Label end, Label handler,
263-
String type) {
264-
}
265-
266-
public void visitTypeInsn(int opcode, String desc) {
267-
}
268-
269-
public void visitVarInsn(int opcode, int var) {
270-
}
271222
}
272223
}
-315 KB
Binary file not shown.
322 KB
Binary file not shown.

lib/build/asm-3.3.1.jar

-42.6 KB
Binary file not shown.

lib/build/asm-4.0.jar

44.9 KB
Binary file not shown.

lib/build/asm-util-4.0.jar

36.1 KB
Binary file not shown.

lib/build/cglib-2.2.2.jar

-280 KB
Binary file not shown.

lib/build/cglib-3.0.jar

276 KB
Binary file not shown.

0 commit comments

Comments
 (0)