src/java.base/share/classes/java/lang/Module.java

rev 47453 : imported patch jdk-new-asm-update.patch

*** 55,75 ****
  import java.util.stream.Stream;
  
  import jdk.internal.loader.BuiltinClassLoader;
  import jdk.internal.loader.BootLoader;
  import jdk.internal.loader.ClassLoaders;
- import jdk.internal.misc.JavaLangAccess;
- import jdk.internal.misc.SharedSecrets;
  import jdk.internal.module.IllegalAccessLogger;
  import jdk.internal.module.ModuleLoaderMap;
  import jdk.internal.module.ServicesCatalog;
  import jdk.internal.module.Resources;
  import jdk.internal.org.objectweb.asm.AnnotationVisitor;
  import jdk.internal.org.objectweb.asm.Attribute;
  import jdk.internal.org.objectweb.asm.ClassReader;
  import jdk.internal.org.objectweb.asm.ClassVisitor;
  import jdk.internal.org.objectweb.asm.ClassWriter;
  import jdk.internal.org.objectweb.asm.Opcodes;
  import jdk.internal.reflect.CallerSensitive;
  import jdk.internal.reflect.Reflection;
  import sun.security.util.SecurityConstants;
  
--- 55,74 ----
  import java.util.stream.Stream;
  
  import jdk.internal.loader.BuiltinClassLoader;
  import jdk.internal.loader.BootLoader;
  import jdk.internal.loader.ClassLoaders;
  import jdk.internal.module.IllegalAccessLogger;
  import jdk.internal.module.ModuleLoaderMap;
  import jdk.internal.module.ServicesCatalog;
  import jdk.internal.module.Resources;
  import jdk.internal.org.objectweb.asm.AnnotationVisitor;
  import jdk.internal.org.objectweb.asm.Attribute;
  import jdk.internal.org.objectweb.asm.ClassReader;
  import jdk.internal.org.objectweb.asm.ClassVisitor;
  import jdk.internal.org.objectweb.asm.ClassWriter;
+ import jdk.internal.org.objectweb.asm.ModuleVisitor;
  import jdk.internal.org.objectweb.asm.Opcodes;
  import jdk.internal.reflect.CallerSensitive;
  import jdk.internal.reflect.Reflection;
  import sun.security.util.SecurityConstants;
  
*** 1430,1440 ****
          final String MODULE_INFO = "module-info";
  
          ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
                                           + ClassWriter.COMPUTE_FRAMES);
  
!         ClassVisitor cv = new ClassVisitor(Opcodes.ASM5, cw) {
              @Override
              public void visit(int version,
                                int access,
                                String name,
                                String signature,
--- 1429,1439 ----
          final String MODULE_INFO = "module-info";
  
          ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
                                           + ClassWriter.COMPUTE_FRAMES);
  
!         ClassVisitor cv = new ClassVisitor(Opcodes.ASM6, cw) {
              @Override
              public void visit(int version,
                                int access,
                                String name,
                                String signature,
*** 1456,1465 ****
--- 1455,1469 ----
              }
              @Override
              public void visitAttribute(Attribute attr) {
                  // drop non-annotation attributes
              }
+             @Override
+             public ModuleVisitor visitModule(String name, int flags, String version) {
+                 // drop Module attribute
+                 return null;
+             }
          };
  
          ClassReader cr = new ClassReader(in);
          cr.accept(cv, 0);
          byte[] bytes = cw.toByteArray();