azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to ASM5

Browse Source
This commit is contained in:
Nikolay Krasko
2014-03-26 15:07:05 +04:00
parent 95fd870988
commit 4aa3dff2a2
21 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java
+2 -2
View File
@@ -181,13 +181,13 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT
List<LocalVariable> readVariables = new ArrayList<LocalVariable>();
public Visitor() {
super(Opcodes.ASM4);
super(Opcodes.ASM5);
}
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
if (methodName.equals(name + desc)) {
return new MethodVisitor(Opcodes.ASM4) {
return new MethodVisitor(Opcodes.ASM5) {
@Override
public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index) {
readVariables.add(new LocalVariable(name, desc, index));
compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
+3 -3
View File
@@ -164,14 +164,14 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
assertNotNull(file);
ClassReader reader = new ClassReader(file.asByteArray());
reader.accept(new ClassVisitor(Opcodes.ASM4) {
reader.accept(new ClassVisitor(Opcodes.ASM5) {
@Override
public MethodVisitor visitMethod(
int access, final String callerName, final String callerDesc, String signature, String[] exceptions
) {
return new MethodVisitor(Opcodes.ASM4) {
return new MethodVisitor(Opcodes.ASM5) {
@Override
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
assertFalse(
"Intrinsics method is called: " + name + desc + " Caller: " + callerName + callerDesc,
"kotlin/jvm/internal/Intrinsics".equals(owner)
compiler/tests/org/jetbrains/jet/codegen/InnerClassInfoGenTest.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class InnerClassInfoGenTest extends CodegenTestCase {
ClassReader reader = new ClassReader(bytes);
final List<InnerClassAttribute> result = new ArrayList<InnerClassAttribute>();
reader.accept(new ClassVisitor(ASM4) {
reader.accept(new ClassVisitor(ASM5) {
@Override
public void visitInnerClass(String name, String outerName, String innerName, int access) {
result.add(new InnerClassAttribute(name, outerName, innerName, access));
compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java
+5 -5
View File
@@ -175,14 +175,14 @@ public class LineNumberTest extends TestCaseWithTmpdir {
final List<Label> labels = Lists.newArrayList();
final Map<Label, Integer> labels2LineNumbers = Maps.newHashMap();
ClassVisitor visitor = new ClassVisitor(Opcodes.ASM4) {
ClassVisitor visitor = new ClassVisitor(Opcodes.ASM5) {
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
return new MethodVisitor(Opcodes.ASM4) {
return new MethodVisitor(Opcodes.ASM5) {
private Label lastLabel;
@Override
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
if (LINE_NUMBER_FUN.equals(name)) {
assert lastLabel != null : "A function call with no preceding label";
labels.add(lastLabel);
@@ -218,10 +218,10 @@ public class LineNumberTest extends TestCaseWithTmpdir {
@NotNull
private static List<Integer> readAllLineNumbers(@NotNull ClassReader reader) {
final List<Integer> result = new ArrayList<Integer>();
reader.accept(new ClassVisitor(Opcodes.ASM4) {
reader.accept(new ClassVisitor(Opcodes.ASM5) {
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
return new MethodVisitor(Opcodes.ASM4) {
return new MethodVisitor(Opcodes.ASM5) {
@Override
public void visitLineNumber(int line, Label label) {
result.add(line);
compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class OuterClassGenTest extends CodegenTestCase {
public OuterClassInfo getOuterClassInfo(ClassReader reader) {
final OuterClassInfo info = new OuterClassInfo();
reader.accept(new ClassVisitor(Opcodes.ASM4) {
reader.accept(new ClassVisitor(Opcodes.ASM5) {
@Override
public void visitOuterClass(String owner, String name, String desc) {
info.owner = owner;
compiler/tests/org/jetbrains/jet/codegen/SourceInfoGenTest.java
+2 -2
View File
@@ -51,8 +51,8 @@ public class SourceInfoGenTest extends CodegenTestCase {
ClassReader classReader = new ClassReader(file.asByteArray());
final String [] producer = new String [1];
classReader.accept(new ClassVisitor(Opcodes.ASM4) {
final String [] producer = new String[1];
classReader.accept(new ClassVisitor(Opcodes.ASM5) {
@Override
public void visitSource(String source, String debug) {
compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java
+1 -1
View File
@@ -180,7 +180,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
protected boolean isExists;
public TestClassVisitor() {
super(Opcodes.ASM4);
super(Opcodes.ASM5);
}
abstract public int getAccess();
compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java
+2 -2
View File
@@ -110,7 +110,7 @@ public abstract class AbstractWriteSignatureTest extends TestCaseWithTmpdir {
ActualSignature readSignature;
public Visitor() {
super(Opcodes.ASM4);
super(Opcodes.ASM5);
}
@Override
@@ -126,7 +126,7 @@ public abstract class AbstractWriteSignatureTest extends TestCaseWithTmpdir {
public MethodVisitor visitMethod(int access, String name, final String desc, final String signature, String[] exceptions) {
if (name.equals(methodName)) {
return new MethodVisitor(Opcodes.ASM4) {
return new MethodVisitor(Opcodes.ASM5) {
@Override
public void visitEnd() {
Assert.assertNull(readSignature);