changeset 4283:2f4d37fefc9e

ACC_PRIVATE_REFLECTION to ACC_REFLECTION
author jjg
date Fri, 02 Sep 2016 14:21:18 -0700
parents 22f7608d1b4f
children 4db263f9343d
files src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java
diffstat 6 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java	Fri Sep 02 13:21:31 2016 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java	Fri Sep 02 14:21:18 2016 -0700
@@ -77,7 +77,7 @@
     /** Flags for ExportsDirective. */
     public enum ExportsFlag {
         DYNAMIC_PHASE(0x0040),
-        PRIVATE_REFLECTION(0x0080),
+        REFLECTION(0x0080),
         SYNTHETIC(0x1000),
         MANDATED(0x8000);
 
@@ -127,7 +127,7 @@
 
         @Override @DefinedBy(Api.LANGUAGE_MODEL)
         public boolean isPrivate() {
-            return flags.contains(ExportsFlag.PRIVATE_REFLECTION);
+            return flags.contains(ExportsFlag.REFLECTION);
         }
 
         @Override @DefinedBy(Api.LANGUAGE_MODEL)
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java	Fri Sep 02 13:21:31 2016 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java	Fri Sep 02 14:21:18 2016 -0700
@@ -680,7 +680,7 @@
                     flags.add(ExportsFlag.DYNAMIC_PHASE);
                 }
                 if (tree.isPrivate) {
-                    flags.add(ExportsFlag.PRIVATE_REFLECTION);
+                    flags.add(ExportsFlag.REFLECTION);
                 }
                 ExportsDirective d = new ExportsDirective(packge, toModules, flags);
                 tree.directive = d;
@@ -780,7 +780,7 @@
             }
             Directive.ExportsDirective d =
                     new Directive.ExportsDirective(null, null,
-                            EnumSet.of(ExportsFlag.DYNAMIC_PHASE, ExportsFlag.PRIVATE_REFLECTION, ExportsFlag.MANDATED));
+                            EnumSet.of(ExportsFlag.DYNAMIC_PHASE, ExportsFlag.REFLECTION, ExportsFlag.MANDATED));
             sym.exports = sym.exports.prepend(d);
         }
 
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java	Fri Sep 02 13:21:31 2016 +0100
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java	Fri Sep 02 14:21:18 2016 -0700
@@ -36,12 +36,12 @@
  *  deletion without notice.</b>
  */
 public class Module_attribute extends Attribute {
-    public static final int ACC_TRANSITIVE          =   0x10;
-    public static final int ACC_STATIC_PHASE        =   0x20;
-    public static final int ACC_DYNAMIC_PHASE       =   0x40;
-    public static final int ACC_PRIVATE_REFLECTION  =   0x80;
-    public static final int ACC_SYNTHETIC           = 0x1000;
-    public static final int ACC_MANDATED            = 0x8000;
+    public static final int ACC_TRANSITIVE      =   0x10;
+    public static final int ACC_STATIC_PHASE    =   0x20;
+    public static final int ACC_DYNAMIC_PHASE   =   0x40;
+    public static final int ACC_REFLECTION      =   0x80;
+    public static final int ACC_SYNTHETIC       = 0x1000;
+    public static final int ACC_MANDATED        = 0x8000;
 
     Module_attribute(ClassReader cr, int name_index, int length) throws IOException {
         super(name_index, length);
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java	Fri Sep 02 13:21:31 2016 +0100
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java	Fri Sep 02 14:21:18 2016 -0700
@@ -552,7 +552,7 @@
                 print(" ACC_SYNTHETIC");
             if ((e.exports_flags & Module_attribute.ACC_DYNAMIC_PHASE) != 0)
                 print(" ACC_DYNAMIC_PHASE");
-            if ((e.exports_flags & Module_attribute.ACC_PRIVATE_REFLECTION) != 0)
+            if ((e.exports_flags & Module_attribute.ACC_REFLECTION) != 0)
                 print(" ACC_PRIVATE_REFLECTION");
             if (e.exports_to_index.length == 0) {
                 println();
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java	Fri Sep 02 13:21:31 2016 +0100
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java	Fri Sep 02 14:21:18 2016 -0700
@@ -568,7 +568,7 @@
             print("exports");
             if ((entry.exports_flags & Module_attribute.ACC_DYNAMIC_PHASE) != 0)
                 print(" dynamic");
-            if ((entry.exports_flags & Module_attribute.ACC_PRIVATE_REFLECTION) != 0)
+            if ((entry.exports_flags & Module_attribute.ACC_REFLECTION) != 0)
                 print(" private");
             print(" ");
             if (entry.exports_index == 0) {
--- a/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java	Fri Sep 02 13:21:31 2016 +0100
+++ b/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java	Fri Sep 02 14:21:18 2016 -0700
@@ -171,7 +171,7 @@
 
     enum ExportFlag implements Mask {
         DYNAMIC("dynamic", Module_attribute.ACC_DYNAMIC_PHASE),
-        PRIVATE("private", Module_attribute.ACC_PRIVATE_REFLECTION);
+        PRIVATE("private", Module_attribute.ACC_REFLECTION);
 
         private final String token;
         private final int mask;