archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8266670: Better modeling of access flags in core reflection

Browse source 
Reviewed-by: mchung, rriggs, asotona
This commit is contained in:
Joe Darcy 2022-06-25 19:09:43 +00:00
parent a5c25d8837
commit de7467146f
14 changed files with 1480 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

110
src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
View file

@ -29,6 +29,7 @@ import java.io.InputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.io.UncheckedIOException;
import java.lang.reflect.AccessFlag;
import java.nio.ByteBuffer;
import java.nio.file.Path;
import java.util.ArrayList;
@ -105,7 +106,7 @@ public class ModuleDescriptor
* An open module. An open module does not declare any open packages
* but the resulting module is treated as if all packages are open.
*/
OPEN,
OPEN(AccessFlag.OPEN.mask()),
/**
* An automatic module. An automatic module is treated as if it exports
@ -114,19 +115,24 @@ public class ModuleDescriptor
* @apiNote This modifier does not correspond to a module flag in the
* binary form of a module declaration ({@code module-info.class}).
*/
AUTOMATIC,
AUTOMATIC(0 /* no flag per above comment */),
/**
* The module was not explicitly or implicitly declared.
*/
SYNTHETIC,
SYNTHETIC(AccessFlag.SYNTHETIC.mask()),
/**
* The module was implicitly declared.
*/
MANDATED;
}
MANDATED(AccessFlag.MANDATED.mask());
private final int mask;
private Modifier(int mask) {
this.mask = mask;
}
private int mask() {return mask;}
}
/**
* <p> A dependence upon a module. </p>
@ -152,28 +158,31 @@ public class ModuleDescriptor
* module</i> to have an implicitly declared dependence on the module
* named by the {@code Requires}.
*/
TRANSITIVE,
TRANSITIVE(AccessFlag.TRANSITIVE.mask()),
/**
* The dependence is mandatory in the static phase, during compilation,
* but is optional in the dynamic phase, during execution.
*/
STATIC,
STATIC(AccessFlag.STATIC_PHASE.mask()),
/**
* The dependence was not explicitly or implicitly declared in the
* source of the module declaration.
*/
SYNTHETIC,
SYNTHETIC(AccessFlag.SYNTHETIC.mask()),
/**
* The dependence was implicitly declared in the source of the module
* declaration.
*/
MANDATED;
MANDATED(AccessFlag.MANDATED.mask());
private final int mask;
private Modifier(int mask) {
this.mask = mask;
}
private int mask() {return mask;}
}
private final Set<Modifier> mods;
private final String name;
private final Version compiledVersion;
@ -203,6 +212,21 @@ public class ModuleDescriptor
return mods;
}
/**
* {@return an unmodifiable set of the module {@linkplain AccessFlag
* requires flags, possibly empty}}
* @see #modifiers()
* @jvms 4.7.25 The Module Attribute
* @since 20
*/
public Set<AccessFlag> accessFlags() {
int mask = 0;
for (var modifier : mods) {
mask |= modifier.mask();
}
return AccessFlag.maskToAccessFlags(mask, AccessFlag.Location.MODULE_REQUIRES);
}
/**
* Return the module name.
*
@ -376,14 +400,19 @@ public class ModuleDescriptor
* The export was not explicitly or implicitly declared in the
* source of the module declaration.
*/
SYNTHETIC,
SYNTHETIC(AccessFlag.SYNTHETIC.mask()),
/**
* The export was implicitly declared in the source of the module
* declaration.
*/
MANDATED;
MANDATED(AccessFlag.MANDATED.mask());
private final int mask;
private Modifier(int mask) {
this.mask = mask;
}
private int mask() {return mask;}
}
private final Set<Modifier> mods;
@ -417,6 +446,21 @@ public class ModuleDescriptor
return mods;
}
/**
* {@return an unmodifiable set of the module {@linkplain AccessFlag
* export flags} for this module descriptor, possibly empty}
* @see #modifiers()
* @jvms 4.7.25 The Module Attribute
* @since 20
*/
public Set<AccessFlag> accessFlags() {
int mask = 0;
for (var modifier : mods) {
mask |= modifier.mask();
}
return AccessFlag.maskToAccessFlags(mask, AccessFlag.Location.MODULE_EXPORTS);
}
/**
* Returns {@code true} if this is a qualified export.
*
@ -579,14 +623,18 @@ public class ModuleDescriptor
* The open package was not explicitly or implicitly declared in
* the source of the module declaration.
*/
SYNTHETIC,
SYNTHETIC(AccessFlag.SYNTHETIC.mask()),
/**
* The open package was implicitly declared in the source of the
* module declaration.
*/
MANDATED;
MANDATED(AccessFlag.MANDATED.mask());
private final int mask;
private Modifier(int mask) {
this.mask = mask;
}
private int mask() {return mask;}
}
private final Set<Modifier> mods;
@ -620,6 +668,21 @@ public class ModuleDescriptor
return mods;
}
/**
* {@return an unmodifiable set of the module {@linkplain AccessFlag
* opens flags}, possibly empty}
* @see #modifiers()
* @jvms 4.7.25 The Module Attribute
* @since 20
*/
public Set<AccessFlag> accessFlags() {
int mask = 0;
for (var modifier : mods) {
mask |= modifier.mask();
}
return AccessFlag.maskToAccessFlags(mask, AccessFlag.Location.MODULE_OPENS);
}
/**
* Returns {@code true} if this is a qualified {@code Opens}.
*
@ -1290,6 +1353,21 @@ public class ModuleDescriptor
return modifiers;
}
/**
* {@return an unmodifiable set of the {@linkplain AccessFlag
* module flags}, possibly empty}
* @see #modifiers()
* @jvms 4.7.25 The Module Attribute
* @since 20
*/
public Set<AccessFlag> accessFlags() {
int mask = 0;
for (var modifier : modifiers) {
mask |= modifier.mask();
}
return AccessFlag.maskToAccessFlags(mask, AccessFlag.Location.MODULE);
}
/**
* <p> Returns {@code true} if this is an open module. </p>
*