diff options
Diffstat (limited to 'plugins/IntelliLang/intellilang-jps-plugin/src')
4 files changed, 17 insertions, 17 deletions
diff --git a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/ErrorPostponingMethodVisitor.java b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/ErrorPostponingMethodVisitor.java index e47eab83c397..5d337a1fd597 100644 --- a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/ErrorPostponingMethodVisitor.java +++ b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/ErrorPostponingMethodVisitor.java @@ -17,8 +17,8 @@ package org.jetbrains.jps.intellilang.instrumentation; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.asm4.MethodVisitor; -import org.jetbrains.asm4.Opcodes; +import org.jetbrains.org.objectweb.asm.MethodVisitor; +import org.jetbrains.org.objectweb.asm.Opcodes; /** * @author Eugene Zhuravlev @@ -30,7 +30,7 @@ public class ErrorPostponingMethodVisitor extends MethodVisitor { private final String myMethodName; public ErrorPostponingMethodVisitor(@NotNull PatternInstrumenter instrumenter, String methodName, @Nullable MethodVisitor methodvisitor) { - super(Opcodes.ASM4, methodvisitor); + super(Opcodes.ASM5, methodvisitor); myInstrumenter = instrumenter; myMethodName = methodName; } diff --git a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/InstrumentationAdapter.java b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/InstrumentationAdapter.java index 4d2a5ac6eedc..d782b69e3088 100644 --- a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/InstrumentationAdapter.java +++ b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/InstrumentationAdapter.java @@ -17,7 +17,7 @@ package org.jetbrains.jps.intellilang.instrumentation; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; -import org.jetbrains.asm4.*; +import org.jetbrains.org.objectweb.asm.*; import java.text.MessageFormat; import java.util.ArrayList; @@ -45,7 +45,7 @@ class InstrumentationAdapter extends MethodVisitor implements Opcodes { Type returnType, int access, String name) { - super(Opcodes.ASM4, methodvisitor); + super(Opcodes.ASM5, methodvisitor); myInstrumenter = instrumenter; myArgTypes = argTypes; myReturnType = returnType; @@ -180,8 +180,8 @@ class InstrumentationAdapter extends MethodVisitor implements Opcodes { mv.visitIntInsn(BIPUSH, patternIndex); mv.visitInsn(AALOAD); mv.visitVarInsn(ALOAD, varIndex); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/regex/Pattern", "matcher", "(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;"); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/regex/Matcher", "matches", "()Z"); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/regex/Pattern", "matcher", "(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;", false); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/regex/Matcher", "matches", "()Z", false); mv.visitJumpInsn(Opcodes.IFNE, label); } @@ -206,7 +206,7 @@ class InstrumentationAdapter extends MethodVisitor implements Opcodes { mv.visitTypeInsn(Opcodes.NEW, throwableClass); mv.visitInsn(Opcodes.DUP); mv.visitLdcInsn(message); - mv.visitMethodInsn(Opcodes.INVOKESPECIAL, throwableClass, "<init>", ctorSignature); + mv.visitMethodInsn(Opcodes.INVOKESPECIAL, throwableClass, "<init>", ctorSignature, false); mv.visitInsn(Opcodes.ATHROW); } @@ -215,7 +215,7 @@ class InstrumentationAdapter extends MethodVisitor implements Opcodes { private final PatternValue myPatternValue; public MyAnnotationVisitor(AnnotationVisitor annotationvisitor, PatternValue v) { - super(Opcodes.ASM4); + super(Opcodes.ASM5); av = annotationvisitor; myPatternValue = v; } diff --git a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternInstrumenter.java b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternInstrumenter.java index 083252c17e58..ea215673b719 100644 --- a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternInstrumenter.java +++ b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternInstrumenter.java @@ -20,8 +20,8 @@ import com.intellij.openapi.util.Ref; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.asm4.*; import org.jetbrains.jps.intellilang.model.InstrumentationException; +import org.jetbrains.org.objectweb.asm.*; import java.io.IOException; import java.io.InputStream; @@ -53,7 +53,7 @@ class PatternInstrumenter extends ClassVisitor implements Opcodes { public PatternInstrumenter(@NotNull String patternAnnotationClassName, ClassVisitor classvisitor, InstrumentationType instrumentation, InstrumentationClassFinder classFinder) { - super(Opcodes.ASM4, classvisitor); + super(Opcodes.ASM5, classvisitor); myPatternAnnotationClassName = patternAnnotationClassName; myInstrumentationType = instrumentation; @@ -156,7 +156,7 @@ class PatternInstrumenter extends ClassVisitor implements Opcodes { mv.visitFieldInsn(GETSTATIC, myClassName, PATTERN_CACHE_NAME, JAVA_UTIL_REGEX_PATTERN); mv.visitIntInsn(BIPUSH, i++); mv.visitLdcInsn(pattern); - mv.visitMethodInsn(INVOKESTATIC, "java/util/regex/Pattern", "compile", "(Ljava/lang/String;)Ljava/util/regex/Pattern;"); + mv.visitMethodInsn(INVOKESTATIC, "java/util/regex/Pattern", "compile", "(Ljava/lang/String;)Ljava/util/regex/Pattern;", false); mv.visitInsn(AASTORE); } } @@ -164,7 +164,7 @@ class PatternInstrumenter extends ClassVisitor implements Opcodes { // add assert startup code private void initAssertions(MethodVisitor mv) { mv.visitLdcInsn(Type.getType("L" + myClassName + ";")); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Class", "desiredAssertionStatus", "()Z"); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Class", "desiredAssertionStatus", "()Z", false); Label l0 = new Label(); mv.visitJumpInsn(IFNE, l0); mv.visitInsn(ICONST_1); @@ -251,14 +251,14 @@ class PatternInstrumenter extends ClassVisitor implements Opcodes { final Ref<String> patternString = new Ref<String>(null); // dig into annotation class and check if it is annotated with pattern annotation. // if yes, load the pattern string from the pattern annotation and associate it with this annotation - final ClassVisitor visitor = new ClassVisitor(Opcodes.ASM4) { + final ClassVisitor visitor = new ClassVisitor(Opcodes.ASM5) { @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { if (patternString.get() != null || !myPatternAnnotationClassName.equals(Type.getType(desc).getClassName())) { return null; // already found or is not pattern annotation } // dig into pattern annotation in order to discover the pattern string - return new AnnotationVisitor(Opcodes.ASM4) { + return new AnnotationVisitor(Opcodes.ASM5) { public void visit(@NonNls String name, Object value) { if ("value".equals(name) && value instanceof String) { patternString.set((String)value); diff --git a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternValidatorBuilder.java b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternValidatorBuilder.java index 36853633acfb..f2bbb9a8cbd7 100644 --- a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternValidatorBuilder.java +++ b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternValidatorBuilder.java @@ -18,8 +18,6 @@ package org.jetbrains.jps.intellilang.instrumentation; import com.intellij.compiler.instrumentation.InstrumentationClassFinder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.asm4.ClassReader; -import org.jetbrains.asm4.ClassWriter; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.incremental.BinaryContent; import org.jetbrains.jps.incremental.CompileContext; @@ -30,6 +28,8 @@ import org.jetbrains.jps.incremental.messages.CompilerMessage; import org.jetbrains.jps.intellilang.model.InstrumentationException; import org.jetbrains.jps.intellilang.model.JpsIntelliLangConfiguration; import org.jetbrains.jps.intellilang.model.JpsIntelliLangExtensionService; +import org.jetbrains.org.objectweb.asm.ClassReader; +import org.jetbrains.org.objectweb.asm.ClassWriter; /** * @author Eugene Zhuravlev |