Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8310664: remove compiler support for primitive classes #868

Closed
wants to merge 2 commits into from
+363 −1,102
Closed

8310664: remove compiler support for primitive classes #868

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62b0fc0
8310664: remove compiler support for primitive classes
vicente-romero-oracle Jun 22, 2023
5ed49e1
fixing whitespace issue
vicente-romero-oracle Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
View file
Original file line number Diff line number Diff line change
@@ -1138,7 +1138,7 @@ public TypeMirror getOriginalType(javax.lang.model.type.ErrorType errorType) {
errorType.getKind() == TypeKind.ERROR) {
return extraType2OriginalMap.computeIfAbsent(classType, tt ->
new ClassType(classType.getEnclosingType(), classType.typarams_field,
classType.tsym, classType.getMetadata(), classType.getFlavor()) {
classType.tsym, classType.getMetadata()) {
@Override
public Type baseType() { return classType; }
@Override
26 changes: 8 additions & 18 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
View file
Original file line number Diff line number Diff line change
@@ -99,13 +99,6 @@ public static EnumSet<Flag> asFlagSet(long flags) {
/** Added in SE8, represents constructs implicitly declared in source. */
public static final int MANDATED = 1<<15;

/** Marks a type as a primitive class. We can't reuse the class file encoding (ACC_PRIMITIVE)
* since the latter shares its value (0x800) with ACC_STRICT (javac speak: STRICT_FP) and while
* STRICT_FP is not a valid flag for a class in the class file level, javac's ASTs flag a class
* as being STRICT_FP so as to propagate the FP strictness to methods of the class thereby causing
* a clash */
public static final int PRIMITIVE_CLASS = 1<<16;

public static final int StandardFlags = 0x0fff;

// Because the following access flags are overloaded with other
@@ -116,7 +109,6 @@ public static EnumSet<Flag> asFlagSet(long flags) {
public static final int ACC_VALUE = 0x0040;
public static final int ACC_BRIDGE = 0x0040;
public static final int ACC_VARARGS = 0x0080;
public static final int ACC_PRIMITIVE = 0x0800;
public static final int ACC_MODULE = 0x8000;

/*****************************************
@@ -455,15 +447,15 @@ public static String toSource(long flags) {
SYNCHRONIZED | FINAL | STRICTFP,
RecordMethodFlags = AccessFlags | ABSTRACT | STATIC |
SYNCHRONIZED | FINAL | STRICTFP,
AdjustedClassFlags = ClassFlags | ACC_PRIMITIVE | ACC_VALUE;
AdjustedClassFlags = ClassFlags | ACC_VALUE;
public static final long
ExtendedStandardFlags = (long)StandardFlags | DEFAULT | SEALED | NON_SEALED | PRIMITIVE_CLASS | VALUE_CLASS,
ExtendedMemberClassFlags = (long)MemberClassFlags | SEALED | NON_SEALED | PRIMITIVE_CLASS | VALUE_CLASS,
ExtendedMemberStaticClassFlags = (long) MemberStaticClassFlags | SEALED | NON_SEALED | PRIMITIVE_CLASS | VALUE_CLASS,
ExtendedClassFlags = (long)ClassFlags | SEALED | NON_SEALED | PRIMITIVE_CLASS | VALUE_CLASS,
ExtendedLocalClassFlags = (long) LocalClassFlags | PRIMITIVE_CLASS | VALUE_CLASS,
ExtendedStaticLocalClassFlags = (long) StaticLocalClassFlags | PRIMITIVE_CLASS | VALUE_CLASS,
ModifierFlags = ((long)StandardFlags & ~INTERFACE) | DEFAULT | SEALED | NON_SEALED | PRIMITIVE_CLASS | VALUE_CLASS,
ExtendedStandardFlags = (long)StandardFlags | DEFAULT | SEALED | NON_SEALED | VALUE_CLASS,
ExtendedMemberClassFlags = (long)MemberClassFlags | SEALED | NON_SEALED | VALUE_CLASS,
ExtendedMemberStaticClassFlags = (long) MemberStaticClassFlags | SEALED | NON_SEALED | VALUE_CLASS,
ExtendedClassFlags = (long)ClassFlags | SEALED | NON_SEALED | VALUE_CLASS,
ExtendedLocalClassFlags = (long) LocalClassFlags | VALUE_CLASS,
ExtendedStaticLocalClassFlags = (long) StaticLocalClassFlags | VALUE_CLASS,
ModifierFlags = ((long)StandardFlags & ~INTERFACE) | DEFAULT | SEALED | NON_SEALED | VALUE_CLASS,
InterfaceMethodMask = ABSTRACT | PRIVATE | STATIC | PUBLIC | STRICTFP | DEFAULT,
AnnotationTypeElementMask = ABSTRACT | PUBLIC,
LocalVarFlags = FINAL | PARAMETER,
@@ -489,7 +481,6 @@ public static Set<Modifier> asModifierSet(long flags) {
if (0 != (flags & NATIVE)) modifiers.add(Modifier.NATIVE);
if (0 != (flags & STRICTFP)) modifiers.add(Modifier.STRICTFP);
if (0 != (flags & DEFAULT)) modifiers.add(Modifier.DEFAULT);
if (0 != (flags & PRIMITIVE_CLASS)) modifiers.add(Modifier.PRIMITIVE);
if (0 != (flags & VALUE_CLASS)) modifiers.add(Modifier.VALUE);
modifiers = Collections.unmodifiableSet(modifiers);
modifierSets.put(flags, modifiers);
@@ -545,7 +536,6 @@ public String toString() {
FROM_SOURCE(Flags.FROM_SOURCE),
ENUM(Flags.ENUM),
MANDATED(Flags.MANDATED),
PRIMITIVE(Flags.PRIMITIVE_CLASS),
VALUE(Flags.VALUE_CLASS),
NOOUTERTHIS(Flags.NOOUTERTHIS),
EXISTS(Flags.EXISTS),
10 changes: 0 additions & 10 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/code/Printer.java
View file
Original file line number Diff line number Diff line change
@@ -234,16 +234,6 @@ public String visitClassType(ClassType t, Locale locale) {
buf.append(printAnnotations(t));
buf.append(className(t, true, locale));
}
boolean isReferenceProjection;
try {
isReferenceProjection = t.isReferenceProjection();
} catch (CompletionFailure cf) {
isReferenceProjection = false; // handle missing types gracefully.
}
if (isReferenceProjection) {
buf.append('.');
buf.append(t.tsym.name.table.names.ref);
}
if (t.getTypeArguments().nonEmpty()) {
buf.append('<');
buf.append(visitTypes(t.getTypeArguments(), locale));
3 changes: 0 additions & 3 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
View file
Original file line number Diff line number Diff line change
@@ -298,9 +298,6 @@ public Fragment fragment(String sourceName) {

public Error error(String sourceName) {
Assert.checkNonNull(optFragment);
if (this == PRIMITIVE_CLASSES) {
return Errors.PrimitiveClassesNotSupported(minLevel.name);
}
return optKind == DiagKind.NORMAL ?
Errors.FeatureNotSupportedInSource(optFragment, sourceName, minLevel.name) :
Errors.FeatureNotSupportedInSourcePlural(optFragment, sourceName, minLevel.name);
23 changes: 4 additions & 19 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,6 @@
import javax.tools.JavaFileObject;

import com.sun.tools.javac.code.Kinds.Kind;
import com.sun.tools.javac.code.Type.ClassType.Flavor;
import com.sun.tools.javac.comp.Annotate.AnnotationTypeMetadata;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.comp.Attr;
@@ -416,10 +415,6 @@ public boolean isPrivate() {
return (flags_field & Flags.AccessFlags) == PRIVATE;
}

public boolean isPrimitiveClass() {
return (flags() & PRIMITIVE_CLASS) != 0;
}

public boolean isValueClass() {
return !isInterface() && (flags() & VALUE_CLASS) != 0;
}
@@ -1356,7 +1351,7 @@ public ClassSymbol(long flags, Name name, Symbol owner) {
this(
flags,
name,
new ClassType(Type.noType, null, null, List.nil(), Flavor.X_Typeof_X),
new ClassType(Type.noType, null, null, List.nil()),
owner);
this.type.tsym = this;
}
@@ -1393,8 +1388,7 @@ public Type erasure(Types types) {
if (erasure_field == null)
erasure_field = new ClassType(types.erasure(type.getEnclosingType()),
List.nil(), this,
type.getMetadata(),
type.getFlavor());
type.getMetadata());
return erasure_field;
}

@@ -1460,14 +1454,6 @@ public void complete() throws CompletionFailure {
flags_field |= (PUBLIC|STATIC);
this.type = new ErrorType(this, Type.noType);
throw ex;
} finally {
if (this.type != null && this.type.hasTag(CLASS)) {
ClassType ct = (ClassType) this.type;
ct.flavor = ct.flavor.metamorphose((this.flags_field & PRIMITIVE_CLASS) != 0);
if (!this.type.isIntersection() && this.erasure_field != null && this.erasure_field.hasTag(CLASS)) {
((ClassType) this.erasure_field).flavor = ct.flavor;
}
}
}
}

@@ -1655,7 +1641,6 @@ public void reset() {
classType.supertype_field = null;
classType.interfaces_field = null;
classType.all_interfaces_field = null;
classType.flavor = Flavor.X_Typeof_X;
}
clearAnnotationMetadata();
}
@@ -2088,7 +2073,7 @@ public boolean binaryOverrides(Symbol _other, TypeSymbol origin, Types types) {

// check for a direct implementation
if (other.isOverridableIn((TypeSymbol)owner) &&
types.asSuper(owner.type.referenceProjectionOrSelf(), other.owner) != null &&
types.asSuper(owner.type, other.owner) != null &&
types.isSameType(erasure(types), other.erasure(types)))
return true;

@@ -2157,7 +2142,7 @@ public boolean overrides(Symbol _other, TypeSymbol origin, Types types, boolean

// check for a direct implementation
if (other.isOverridableIn((TypeSymbol)owner) &&
types.asSuper(owner.type.referenceProjectionOrSelf(), other.owner) != null) {
types.asSuper(owner.type, other.owner) != null) {
Type mt = types.memberType(owner.type, this);
Type ot = types.memberType(owner.type, other);
if (types.isSubSignature(mt, ot)) {
19 changes: 3 additions & 16 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
View file
Original file line number Diff line number Diff line change
@@ -95,8 +95,6 @@ public static Symtab instance(Context context) {
return instance;
}

private final boolean allowPrimitiveClasses;

/** Builtin types.
*/
public final JCPrimitiveType byteType = new JCPrimitiveType(BYTE, null);
@@ -287,18 +285,9 @@ public static Symtab instance(Context context) {
public VarSymbol getClassField(Type type, Types types) {
return classFields.computeIfAbsent(
new UniqueType(type, types), k -> {
Type arg = null;
if (type.getTag() == ARRAY || type.getTag() == CLASS) {
/* Temporary treatment for primitive class: Given a primitive class V that implements
I1, I2, ... In, V.class is typed to be Class<? extends Object & I1 & I2 .. & In>
*/
if (allowPrimitiveClasses && type.isPrimitiveClass()) {
List<Type> bounds = List.of(objectType).appendList(((ClassSymbol) type.tsym).getInterfaces());
arg = new WildcardType(bounds.size() > 1 ? types.makeIntersectionType(bounds) : objectType, BoundKind.EXTENDS, boundClass);
} else {
arg = types.erasure(type);
}
}
Type arg;
if (type.getTag() == ARRAY || type.getTag() == CLASS)
arg = types.erasure(type);
else if (type.isPrimitiveOrVoid())
arg = types.boxedClass(type).type;
else
@@ -685,8 +674,6 @@ public <R, P> R accept(ElementVisitor<R, P> v, P p) {

if (java_base != noModule)
java_base.completer = moduleCompleter::complete; //bootstrap issues
Options options = Options.instance(context);
allowPrimitiveClasses = Feature.PRIMITIVE_CLASSES.allowedInSource(source) && options.isSet("enablePrimitiveClasses");
}

/** Define a new class given its name and owner.
Loading