changeset 52889:6409248d836c asm-condy

removing additional references to outdated ASM versions
author vromero
date Wed, 10 Oct 2018 08:14:43 -0700
parents 50acd80d3b6e
children 74a30fa0d1e5
files src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/ConstructorTracerWriter.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/ConstructorWriter.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIClassInstrumentation.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIInliner.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIMethodCallInliner.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIMethodMergeAdapter.java src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java test/jdk/java/lang/instrument/asmlib/Instrumentor.java test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java test/jdk/jdk/jfr/event/io/TestInstrumentation.java
diffstat 11 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java	Wed Oct 10 08:14:43 2018 -0700
@@ -35,7 +35,7 @@
 class TypeConvertingMethodAdapter extends MethodVisitor {
 
     TypeConvertingMethodAdapter(MethodVisitor mv) {
-        super(Opcodes.ASM5, mv);
+        super(Opcodes.ASM7, mv);
     }
 
     private static final int NUM_WRAPPERS = Wrapper.COUNT;
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/ConstructorTracerWriter.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/ConstructorTracerWriter.java	Wed Oct 10 08:14:43 2018 -0700
@@ -50,7 +50,7 @@
     }
 
     private ConstructorTracerWriter(ClassVisitor cv, Class<?> classToChange) {
-        super(Opcodes.ASM5, cv);
+        super(Opcodes.ASM7, cv);
         useInputParameter = new ConstructorWriter(classToChange, true);
         noUseInputParameter = new ConstructorWriter(classToChange, false);
     }
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/ConstructorWriter.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/ConstructorWriter.java	Wed Oct 10 08:14:43 2018 -0700
@@ -39,7 +39,7 @@
     private String fullClassName;
 
     ConstructorWriter(Class<?> classToChange, boolean useInputParameter) {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM7);
         this.useInputParameter = useInputParameter;
         shortClassName = classToChange.getSimpleName();
         fullClassName = classToChange.getName().replace('.', '/');
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIClassInstrumentation.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIClassInstrumentation.java	Wed Oct 10 08:14:43 2018 -0700
@@ -106,7 +106,7 @@
 
         ClassNode temporary = new ClassNode();
         ClassVisitor inliner = new JIInliner(
-                Opcodes.ASM5,
+                Opcodes.ASM7,
                 temporary,
                 targetName,
                 instrumentorName,
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIInliner.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIInliner.java	Wed Oct 10 08:14:43 2018 -0700
@@ -60,7 +60,7 @@
         this.instrumentationClassName = instrumentationClassName;
         this.instrumentationMethods = instrumentationMethods;
 
-        ClassNode cn = new ClassNode(Opcodes.ASM5);
+        ClassNode cn = new ClassNode(Opcodes.ASM7);
         targetClassReader.accept(cn, ClassReader.EXPAND_FRAMES);
         this.targetClassNode = cn;
     }
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIMethodCallInliner.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIMethodCallInliner.java	Wed Oct 10 08:14:43 2018 -0700
@@ -70,7 +70,7 @@
      */
     public JIMethodCallInliner(int access, String desc, MethodVisitor mv,
             MethodNode inlineTarget, String oldClass, String newClass) {
-        super(Opcodes.ASM5, access, desc, mv);
+        super(Opcodes.ASM7, access, desc, mv);
         this.oldClass = oldClass;
         this.newClass = newClass;
         this.inlineTarget = inlineTarget;
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIMethodMergeAdapter.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIMethodMergeAdapter.java	Wed Oct 10 08:14:43 2018 -0700
@@ -64,7 +64,7 @@
      * @param typeMappings - while merging, type references in the methods will be changed according to this map
      */
     public JIMethodMergeAdapter(ClassVisitor cv, ClassNode cn, List<Method> methodFilter, JITypeMapping[] typeMappings) {
-        super(Opcodes.ASM5, cv);
+        super(Opcodes.ASM7, cv);
         this.cn = cn;
         this.methodFilter = methodFilter;
 
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java	Wed Oct 10 08:14:43 2018 -0700
@@ -94,7 +94,7 @@
      * information
      */
     public NashornTextifier(final ScriptEnvironment env, final NashornClassReader cr) {
-        this(Opcodes.ASM5);
+        this(Opcodes.ASM7);
         this.env = env;
         this.cr = cr;
     }
--- a/test/jdk/java/lang/instrument/asmlib/Instrumentor.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/test/jdk/java/lang/instrument/asmlib/Instrumentor.java	Wed Oct 10 08:14:43 2018 -0700
@@ -102,7 +102,7 @@
     }
 
     public synchronized Instrumentor addMethodEntryInjection(String methodName, Consumer<InstrHelper> injector) {
-        instrumentingVisitor = new ClassVisitor(Opcodes.ASM5, instrumentingVisitor) {
+        instrumentingVisitor = new ClassVisitor(Opcodes.ASM7, instrumentingVisitor) {
             @Override
             public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
                 MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
@@ -110,7 +110,7 @@
                 if (name.equals(methodName)) {
                     matches.getAndIncrement();
 
-                    mv = new MethodVisitor(Opcodes.ASM5, mv) {
+                    mv = new MethodVisitor(Opcodes.ASM7, mv) {
                         @Override
                         public void visitCode() {
                             injector.accept(new InstrHelper(mv, name));
@@ -124,7 +124,7 @@
     }
 
     public synchronized Instrumentor addNativeMethodTrackingInjection(String prefix, Consumer<InstrHelper> injector) {
-        instrumentingVisitor = new ClassVisitor(Opcodes.ASM5, instrumentingVisitor) {
+        instrumentingVisitor = new ClassVisitor(Opcodes.ASM7, instrumentingVisitor) {
             private final Set<Consumer<ClassVisitor>> wmGenerators = new HashSet<>();
             private String className;
 
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java	Wed Oct 10 08:14:43 2018 -0700
@@ -372,7 +372,7 @@
             throw new Error("TESTBUG : unexpected IOE during class reading", e);
         }
         cw = new ClassWriter(cr, 0);
-        ClassVisitor cv = new ClassVisitor(Opcodes.ASM5, cw) {
+        ClassVisitor cv = new ClassVisitor(Opcodes.ASM7, cw) {
             @Override
             public MethodVisitor visitMethod(int access, String name, String desc, String descriptor, String[] exceptions) {
                 System.out.println("Method: " +name);
@@ -390,7 +390,7 @@
         private Collection<Call> calls;
 
         public CallTracer(Class<?> aClass, String name, String desc, MethodVisitor mv, Collection<Call> calls) {
-            super(Opcodes.ASM5, mv);
+            super(Opcodes.ASM7, mv);
             caller = new MethodDesc(aClass.getName(), name, desc);
             this.calls = calls;
         }
--- a/test/jdk/jdk/jfr/event/io/TestInstrumentation.java	Tue Oct 09 13:18:28 2018 -0700
+++ b/test/jdk/jdk/jfr/event/io/TestInstrumentation.java	Wed Oct 10 08:14:43 2018 -0700
@@ -329,7 +329,7 @@
         private String className;
 
         public CallbackClassVisitor(ClassVisitor cv) {
-            super(Opcodes.ASM5, cv);
+            super(Opcodes.ASM7, cv);
         }
 
         @Override
@@ -358,7 +358,7 @@
         private String logMessage;
 
         public CallbackMethodVisitor(MethodVisitor mv, String logMessage) {
-            super(Opcodes.ASM5, mv);
+            super(Opcodes.ASM7, mv);
             this.logMessage = logMessage;
         }