src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 24,33 ****
--- 24,34 ----
   */
  
  package jdk.internal.module;
  
  import java.lang.module.ModuleDescriptor;
+ import java.lang.module.ModuleDescriptor.Builder;
  import java.lang.module.ModuleDescriptor.Requires;
  import java.lang.module.ModuleDescriptor.Exports;
  import java.lang.module.ModuleDescriptor.Opens;
  import java.lang.module.ModuleDescriptor.Provides;
  import java.lang.module.ModuleDescriptor.Version;
*** 96,113 ****
              String mn = cr.readModule(off, buf);
              off += 2;
  
              // module_flags
              int module_flags = cr.readUnsignedShort(off);
-             boolean open = ((module_flags & ACC_OPEN) != 0);
-             boolean synthetic = ((module_flags & ACC_SYNTHETIC) != 0);
              off += 2;
  
!             ModuleDescriptor.Builder builder = JLMA.newModuleBuilder(mn,
!                                                                      false,
!                                                                      open,
!                                                                      synthetic);
  
              // module_version
              String module_version = cr.readUTF8(off, buf);
              off += 2;
              if (replacementVersion != null) {
--- 97,117 ----
              String mn = cr.readModule(off, buf);
              off += 2;
  
              // module_flags
              int module_flags = cr.readUnsignedShort(off);
              off += 2;
  
!             Set<ModuleDescriptor.Modifier> modifiers = new HashSet<>();
!             if ((module_flags & ACC_OPEN) != 0)
!                 modifiers.add(ModuleDescriptor.Modifier.OPEN);
!             if ((module_flags & ACC_SYNTHETIC) != 0)
!                 modifiers.add(ModuleDescriptor.Modifier.SYNTHETIC);
!             if ((module_flags & ACC_MANDATED) != 0)
!                 modifiers.add(ModuleDescriptor.Modifier.MANDATED);
! 
!             Builder builder = JLMA.newModuleBuilder(mn, false, modifiers);
  
              // module_version
              String module_version = cr.readUTF8(off, buf);
              off += 2;
              if (replacementVersion != null) {
*** 140,162 ****
                          mods.add(Requires.Modifier.SYNTHETIC);
                      if ((requires_flags & ACC_MANDATED) != 0)
                          mods.add(Requires.Modifier.MANDATED);
                  }
  
- 
                  // requires_version
-                 Version compiledVersion = null;
                  String requires_version = cr.readUTF8(off, buf);
                  off += 2;
!                 if (requires_version != null) {
!                     compiledVersion = Version.parse(requires_version);
!                 }
! 
!                 if (compiledVersion == null) {
                      builder.requires(mods, dn);
                  } else {
!                     builder.requires(mods, dn, compiledVersion);
                  }
              }
  
              // exports_count and exports[exports_count]
              int exports_count = cr.readUnsignedShort(off);
--- 144,160 ----
                          mods.add(Requires.Modifier.SYNTHETIC);
                      if ((requires_flags & ACC_MANDATED) != 0)
                          mods.add(Requires.Modifier.MANDATED);
                  }
  
                  // requires_version
                  String requires_version = cr.readUTF8(off, buf);
                  off += 2;
!                 if (requires_version == null) {
                      builder.requires(mods, dn);
                  } else {
!                     JLMA.requires(builder, mods, dn, requires_version);
                  }
              }
  
              // exports_count and exports[exports_count]
              int exports_count = cr.readUnsignedShort(off);
*** 281,295 ****
              String mn = descriptor.name();
              int module_name_index = cw.newModule(mn);
              attr.putShort(module_name_index);
  
              // module_flags
              int module_flags = 0;
!             if (descriptor.isOpen())
                  module_flags |= ACC_OPEN;
!             if (descriptor.isSynthetic())
                  module_flags |= ACC_SYNTHETIC;
              attr.putShort(module_flags);
  
              // module_version
              Version v = descriptor.version().orElse(null);
              if (v == null) {
--- 279,296 ----
              String mn = descriptor.name();
              int module_name_index = cw.newModule(mn);
              attr.putShort(module_name_index);
  
              // module_flags
+             Set<ModuleDescriptor.Modifier> modifiers = descriptor.modifiers();
              int module_flags = 0;
!             if (modifiers.contains(ModuleDescriptor.Modifier.OPEN))
                  module_flags |= ACC_OPEN;
!             if (modifiers.contains(ModuleDescriptor.Modifier.SYNTHETIC))
                  module_flags |= ACC_SYNTHETIC;
+             if (modifiers.contains(ModuleDescriptor.Modifier.MANDATED))
+                 module_flags |= ACC_MANDATED;
              attr.putShort(module_flags);
  
              // module_version
              Version v = descriptor.version().orElse(null);
              if (v == null) {