changeset 52887:72bd4c6ac1e7 asm-condy

Opcodes.ASM6 -> Opcodes.ASM7
author vromero
date Tue, 09 Oct 2018 12:13:50 -0700
parents 78ec06b98729
children 50acd80d3b6e
files make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java src/java.base/share/classes/java/lang/Module.java src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
diffstat 5 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java	Tue Oct 09 11:48:36 2018 -0700
+++ b/make/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java	Tue Oct 09 12:13:50 2018 -0700
@@ -43,7 +43,7 @@
     /**
      * ASM version to be used by nasgen tool.
      */
-    public static final int ASM_VERSION = Opcodes.ASM5;
+    public static final int ASM_VERSION = Opcodes.ASM7;
 
     private static final boolean DEBUG = Boolean.getBoolean("nasgen.debug");
 
--- a/src/java.base/share/classes/java/lang/Module.java	Tue Oct 09 11:48:36 2018 -0700
+++ b/src/java.base/share/classes/java/lang/Module.java	Tue Oct 09 12:13:50 2018 -0700
@@ -1430,7 +1430,7 @@
         ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
                                          + ClassWriter.COMPUTE_FRAMES);
 
-        ClassVisitor cv = new ClassVisitor(Opcodes.ASM6, cw) {
+        ClassVisitor cv = new ClassVisitor(Opcodes.ASM7, cw) {
             @Override
             public void visit(int version,
                               int access,
--- a/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java	Tue Oct 09 11:48:36 2018 -0700
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java	Tue Oct 09 12:13:50 2018 -0700
@@ -153,7 +153,7 @@
 
         ClassReader cr = new ClassReader(in);
 
-        ClassVisitor cv = new ClassVisitor(Opcodes.ASM6, cw) {
+        ClassVisitor cv = new ClassVisitor(Opcodes.ASM7, cw) {
             @Override
             public ModuleVisitor visitModule(String name, int flags, String version) {
                 Version v = ModuleInfoExtender.this.version;
@@ -170,7 +170,7 @@
                     packages.forEach(pn -> mv.visitPackage(pn.replace('.', '/')));
                 }
 
-                return new ModuleVisitor(Opcodes.ASM6, mv) {
+                return new ModuleVisitor(Opcodes.ASM7, mv) {
                     public void visitMainClass(String existingMainClass) {
                         // skip main class if there is a new value
                         if (mainClass == null) {
--- a/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java	Tue Oct 09 11:48:36 2018 -0700
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java	Tue Oct 09 12:13:50 2018 -0700
@@ -244,7 +244,7 @@
         private final Set<Method> methods = new HashSet<>();
 
         public ClassAttributes() {
-            super(Opcodes.ASM6);
+            super(Opcodes.ASM7);
         }
 
         private boolean isPublic(int access) {
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java	Tue Oct 09 11:48:36 2018 -0700
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java	Tue Oct 09 12:13:50 2018 -0700
@@ -434,12 +434,12 @@
 
         boolean hasModulePackages() throws IOException {
             Set<String> packages = new HashSet<>();
-            ClassVisitor cv = new ClassVisitor(Opcodes.ASM6) {
+            ClassVisitor cv = new ClassVisitor(Opcodes.ASM7) {
                 @Override
                 public ModuleVisitor visitModule(String name,
                                                  int flags,
                                                  String version) {
-                    return new ModuleVisitor(Opcodes.ASM6) {
+                    return new ModuleVisitor(Opcodes.ASM7) {
                         public void visitPackage(String pn) {
                             packages.add(pn);
                         }