Remove parametric nullity and nullable marker

Author: Vicente Romero

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java

@@ -2197,9 +2197,6 @@ private void addBound(InferenceBound ib, Type bound, Types types, boolean update
                 }
             } else {
                 Type bound2 = bound.map(toTypeVarMap).baseType();
-                if (types.isParametric(qtype)) {
-                    bound2 = bound2.asNullMarked(bound.getNullMarker());
-                }
                 List<Type> prevBounds = bounds.get(ib);
                 if (bound == qtype) return;
                 for (Type b : prevBounds) {

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java

@@ -107,7 +107,6 @@ public class Types {
 
     /* are nullable and null-restricted types allowed? */
     private boolean allowNullRestrictedTypes;
-    private boolean tvarUnspecifiedNullity;
 
     // <editor-fold defaultstate="collapsed" desc="Instantiating">
     public static Types instance(Context context) {
@@ -139,7 +138,6 @@ public String toString() {
                 Source.Feature.NULL_RESTRICTED_TYPES.allowedInSource(source);
         Options options = Options.instance(context);
         dumpStacktraceOnError = options.isSet("dev") || options.isSet(DOE);
-        tvarUnspecifiedNullity = options.isSet("tvarUnspecifiedNullity");
     }
     // </editor-fold>
 
@@ -2435,9 +2433,7 @@ public Type visitClassType(ClassType t, Symbol sym) {
                             } else {
                                 ListBuffer<Type> newBaseParams = new ListBuffer<>();
                                 for (Type tvar : ownerParams) {
-                                    Type baseParam = isParametric(tvar) ?
-                                            baseParams.head :
-                                            baseParams.head.asNullMarked(NullMarker.UNSPECIFIED);
+                                    Type baseParam = baseParams.head.asNullMarked(NullMarker.UNSPECIFIED);
                                     newBaseParams.add(baseParam);
                                     baseParams = baseParams.tail;
                                 }
@@ -5583,22 +5579,12 @@ public Type constantType(LoadableConstant c) {
 
     // <editor-fold defaultstate="collapsed" desc="nullability methods">
 
-    public boolean isNullable(Type type) {
-        return type.getNullMarker() == NullMarker.NULLABLE;
-    }
-
     public boolean isNonNullable(Type type) {
         return type.getNullMarker() == NullMarker.NOT_NULL;
     }
 
-    public boolean isParametric(Type type) {
-        return type.getNullMarker() == NullMarker.PARAMETRIC ||
-                (type.hasTag(TYPEVAR) && type.getNullMarker() == NullMarker.UNSPECIFIED && !tvarUnspecifiedNullity);
-    }
-
     public boolean isNullUnspecified(Type type) {
-        return type.getNullMarker() == NullMarker.UNSPECIFIED &&
-                (!type.hasTag(TYPEVAR) || tvarUnspecifiedNullity);
+        return type.getNullMarker() == NullMarker.UNSPECIFIED;
     }
 
     /**

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java

@@ -4818,16 +4818,6 @@ public void visitSelect(JCFieldAccess tree) {
         if (!pkind().contains(KindSelector.TYP_PCK))
             site = capture(site); // Capture field access
 
-        // check nullness of site
-        if (types.isNullable(site)) {
-            chk.warnNullableTypes(tree.selected, LintWarnings.AccessingMemberOfNullable);
-        }
-
-        if (types.isParametric(site)) {
-            // see JDK-8339087
-            //chk.warnNullableTypes(tree.selected, Warnings.AccessingMemberOfParametric);
-        }
-
         // don't allow T.class T[].class, etc
         if (skind == KindSelector.TYP) {
             Type elt = site;

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java

@@ -4524,10 +4524,6 @@ public void warn(LintCategory lint) {
             } else {
                 boolean warned = this.warned;
                 if (warned) return;
-                if (types.isParametric(expected)) {
-                    // not sure this is the right warning
-                    Check.this.warnNullableTypes(pos(), LintWarnings.NarrowingNullnessConversion);
-                }
             }
         }
     }

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java

@@ -1751,13 +1751,6 @@ boolean isFinalOrStrictUninitializedField(VarSymbol sym) {
                    classDef.sym.isEnclosedBy((ClassSymbol)sym.owner));
         }
 
-        boolean isUninitializedNonNullableOrParametricField(VarSymbol sym) {
-            return sym.owner.kind == TYP &&
-                    ((sym.flags() & (FINAL | HASINIT | PARAMETER)) == 0 &&
-                            classDef.sym.isEnclosedBy((ClassSymbol)sym.owner) &&
-                            (types.isNonNullable(sym.type) || types.isParametric(sym.type)));
-        }
-
         boolean isUninitializedNonNullableField(VarSymbol sym) {
             return sym.owner.kind == TYP &&
                     ((sym.flags() & (FINAL | HASINIT | PARAMETER)) == 0 &&
@@ -1866,9 +1859,6 @@ void checkInit(DiagnosticPosition pos, VarSymbol sym, Error errkey) {
                 if (isUninitializedNonNullableField(sym)) {
                     if (types.isNonNullable(sym.type)) {
                         log.error(pos, Errors.NonNullableShouldBeInitialized);
-                    } else {
-                        // see JDK-8339087
-                        //log.warning(pos, Warnings.ParametricShouldBeInitialized);
                     }
                 } else {
                     log.error(pos, errkey);

src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java

@@ -609,9 +609,8 @@ Type classSigToType() {
                     sbp = startSbp;
                 }
             }
-            case '?': case '!' : case '=': {
-                char nmChar = (char) c;
-                nm = (nmChar == '=' ? NullMarker.PARAMETRIC : NullMarker.of(String.valueOf(nmChar)));
+            case '!' : {
+                nm = NullMarker.NOT_NULL;
                 continue;
             }
             case '<':           // generic arguments
@@ -684,9 +683,8 @@ public List<Type> getTypeArguments() {
                         }
                 };
                 char currentCh = (char)signature[sigp];
-                if (currentCh == '?' || currentCh == '!' || currentCh == '=' ) {
-                    nm = (currentCh == '=' ? NullMarker.PARAMETRIC : NullMarker.of(String.valueOf(currentCh)));
-                    outer = outer.asNullMarked(nm);
+                if (currentCh == '!' ) {
+                    outer = outer.asNullMarked(NullMarker.NOT_NULL);
                     sigp++;
                 }
                 switch (signature[sigp++]) {

src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java

@@ -2017,15 +2017,7 @@ void setNullMarker(JCExpression exp) {
 
     void setNullMarker(JCExpression exp, Token tk) {
         checkSourceLevel(Feature.NULL_RESTRICTED_TYPES);
-        ((JCNullableTypeExpression)exp).setNullMarker(nullMarker(tk));
-    }
-
-    NullMarker nullMarker(Token tk) {
-        return tk.kind == QUES ?
-                NullMarker.NULLABLE :
-                tk.kind == BANG ?
-                        NullMarker.NOT_NULL :
-                        NullMarker.PARAMETRIC;
+        ((JCNullableTypeExpression)exp).setNullMarker(NullMarker.NOT_NULL);
     }
 
     /**

src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties

@@ -4388,18 +4388,10 @@ compiler.warn.narrowing.nullness.conversion=\
 compiler.warn.unchecked.nullness.conversion=\
     unchecked nullness conversion
 
-# lint: null
-compiler.warn.parametric.should.be.initialized=\
-    field of parametric type should be initialized
-
 # lint: null
 compiler.warn.accessing.member.of.nullable=\
     accessing member of nullable type
 
-# lint: null
-compiler.warn.accessing.member.of.parametric=\
-    accessing member of parametric type
-
 # lint: null
 compiler.warn.overrides.with.different.nullness.1=\
     overriding method''s return type does not match nullness of overridden method
@@ -4409,4 +4401,4 @@ compiler.warn.overrides.with.different.nullness.2=\
     overriding method''s parameter(s) type(s) do not match nullness of overridden method
 
 compiler.err.unsupported.null.restriction=\
-    null restriction not supported in this type context
+    null restriction not supported in this type context

src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java

@@ -2925,8 +2925,6 @@ public JCNullableTypeExpression setNullMarker(NullMarker nullMarker) {
 
         public enum NullMarker {
             NOT_NULL("!"),
-            NULLABLE("?"),
-            PARAMETRIC("*"),
             UNSPECIFIED("");
 
             private final String typeSuffix;
@@ -2942,8 +2940,6 @@ public String typeSuffix() {
             public static NullMarker of(String typeSuffix) {
                 return switch (typeSuffix) {
                     case "!" -> NOT_NULL;
-                    case "?" -> NULLABLE;
-                    case "*" -> PARAMETRIC;
                     case "" -> UNSPECIFIED;
                     default -> throw new AssertionError("invalid type suffix " + typeSuffix);
                 };

test/langtools/tools/javac/diags/examples.not-yet.txt

@@ -230,8 +230,6 @@ compiler.warn.proc.use.proc.or.implicit
 compiler.misc.feature.null.restricted.types
 compiler.warn.accessing.member.of.nullable
 compiler.warn.narrowing.nullness.conversion
-compiler.warn.accessing.member.of.parametric
-compiler.warn.parametric.should.be.initialized
 compiler.misc.attribute.must.be.unique                                   # bad class file
 compiler.misc.attribute.not.applicable.to.field.type                     # bad class file
 compiler.misc.attribute.only.applicable.to.fields                        # bad class file