infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-08-03 14:47:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'JDK-8348611' into JDK-8344159

Browse Source
This commit is contained in:
Archie L. Cobbs 2025-07-03 12:48:00 -05:00
commit abdae7458e
5 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
make/langtools/tools/propertiesparser/gen/ClassGenerator.java
View File

@ -47,6 +47,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
@ -94,7 +95,8 @@ public class ClassGenerator {
WILDCARDS_EXTENDS("wildcards.extends"),
SUPPRESS_WARNINGS("suppress.warnings"),
LINT_CATEGORY("lint.category"),
DIAGNOSTIC_FLAGS("diagnostic.flags");
DIAGNOSTIC_FLAGS_EMPTY("diagnostic.flags.empty"),
DIAGNOSTIC_FLAGS_NON_EMPTY("diagnostic.flags.non-empty");
/** stub key (as it appears in the property file) */
String key;
@ -264,7 +266,8 @@ public class ClassGenerator {
.filter(MessageLine::isDiagnosticFlags)
.map(MessageLine::diagnosticFlags)
.flatMap(Stream::of)
.map(s -> "\"" + s + "\"")
.map(s -> s.replace('-', '_'))
.map(s -> s.toUpperCase(Locale.ROOT))
.collect(Collectors.joining(", "));
String factoryName = factoryName(key);
if (msgInfo.getTypes().isEmpty()) {
@ -272,13 +275,17 @@ public class ClassGenerator {
String factoryField;
if (lintCategory == null) {
factoryField = StubKind.FACTORY_FIELD.format(k.keyClazz, factoryName,
!diagnosticFlags.isEmpty() ? StubKind.DIAGNOSTIC_FLAGS.format(diagnosticFlags) : "null",
diagnosticFlags.isEmpty() ?
StubKind.DIAGNOSTIC_FLAGS_EMPTY.format() :
StubKind.DIAGNOSTIC_FLAGS_NON_EMPTY.format(diagnosticFlags),
"\"" + keyParts[0] + "\"",
"\"" + Stream.of(keyParts).skip(2).collect(Collectors.joining(".")) + "\"",
javadoc);
} else {
factoryField = StubKind.FACTORY_FIELD_LINT.format(k.keyClazz, factoryName,
!diagnosticFlags.isEmpty() ? StubKind.DIAGNOSTIC_FLAGS.format(diagnosticFlags) : "null",
diagnosticFlags.isEmpty() ?
StubKind.DIAGNOSTIC_FLAGS_EMPTY.format() :
StubKind.DIAGNOSTIC_FLAGS_NON_EMPTY.format(diagnosticFlags),
StubKind.LINT_CATEGORY.format("\"" + lintCategory + "\""),
"\"" + keyParts[0] + "\"",
"\"" + Stream.of(keyParts).skip(2).collect(Collectors.joining(".")) + "\"",
@ -296,13 +303,17 @@ public class ClassGenerator {
String methodBody;
if (lintCategory == null) {
methodBody = StubKind.FACTORY_METHOD_BODY.format(k.keyClazz,
!diagnosticFlags.isEmpty() ? StubKind.DIAGNOSTIC_FLAGS.format(diagnosticFlags) : "null",
diagnosticFlags.isEmpty() ?
StubKind.DIAGNOSTIC_FLAGS_EMPTY.format() :
StubKind.DIAGNOSTIC_FLAGS_NON_EMPTY.format(diagnosticFlags),
"\"" + keyParts[0] + "\"",
"\"" + Stream.of(keyParts).skip(2).collect(Collectors.joining(".")) + "\"",
argNames.stream().collect(Collectors.joining(", ")));
} else {
methodBody = StubKind.FACTORY_METHOD_BODY_LINT.format(k.keyClazz,
!diagnosticFlags.isEmpty() ? StubKind.DIAGNOSTIC_FLAGS.format(diagnosticFlags) : "null",
diagnosticFlags.isEmpty() ?
StubKind.DIAGNOSTIC_FLAGS_EMPTY.format() :
StubKind.DIAGNOSTIC_FLAGS_NON_EMPTY.format(diagnosticFlags),
StubKind.LINT_CATEGORY.format("\"" + lintCategory + "\""),
"\"" + keyParts[0] + "\"",
"\"" + Stream.of(keyParts).skip(2).collect(Collectors.joining(".")) + "\"",

16
make/langtools/tools/propertiesparser/resources/templates.properties
View File

@ -35,8 +35,9 @@ toplevel.decl=\
import com.sun.tools.javac.util.JCDiagnostic.Fragment;\n\
import com.sun.tools.javac.code.Lint.LintCategory;\n\
\n\
import java.util.Locale;\n\
import java.util.stream.Stream;\n\
import java.util.EnumSet;\n\
\n\
import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;\n\
\n\
public class {2} '{'\n\
{3}\n\
@ -88,10 +89,9 @@ suppress.warnings=\
lint.category=\
LintCategory.get({0}).get()
diagnostic.flags=\n\
' 'Stream.of({0})\n\
' '.map(s -> s.replace(''-'', ''_''))\n\
' '.map(s -> s.toUpperCase(Locale.ROOT))\n\
' '.map(DiagnosticFlag::valueOf)\n\
' '.toArray(DiagnosticFlag[]::new)
diagnostic.flags.empty=\
EnumSet.noneOf(DiagnosticFlag.class)
diagnostic.flags.non-empty=\
EnumSet.of({0})

31
src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
View File

@ -544,8 +544,8 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
/** The diagnostic kind (i.e. error). */
DiagnosticType type;
/** A set of diagnostic flags to be automatically added to newly created JCDiagnostics (if not null). */
DiagnosticFlag[] flags;
/** A set of diagnostic flags to be automatically added to newly created JCDiagnostics. */
Set<DiagnosticFlag> flags;
/** The diagnostic prefix (i.e. 'javac'); used to compute full resource key. */
String prefix;
@ -557,9 +557,9 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
/** The diagnostic arguments. */
Object[] args;
private DiagnosticInfo(DiagnosticType type, DiagnosticFlag[] flags, String prefix, String code, Object... args) {
private DiagnosticInfo(DiagnosticType type, Set<DiagnosticFlag> flags, String prefix, String code, Object... args) {
this.type = type;
this.flags = flags;
this.flags = flags != null ? flags : EnumSet.noneOf(DiagnosticFlag.class);
this.prefix = prefix;
this.code = code;
this.args = args;
@ -575,11 +575,12 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
/**
* Static factory method; build a custom diagnostic key using given kind, prefix, code and args.
*/
public static DiagnosticInfo of(DiagnosticType type, DiagnosticFlag[] flags, String prefix, String code, Object... args) {
public static DiagnosticInfo of(DiagnosticType type, Set<DiagnosticFlag> flags,
String prefix, String code, Object... args) {
return of(type, flags, null, prefix, code, args);
}
public static DiagnosticInfo of(DiagnosticType type, DiagnosticFlag[] flags,
public static DiagnosticInfo of(DiagnosticType type, Set<DiagnosticFlag> flags,
LintCategory lc, String prefix, String code, Object... args) {
switch (type) {
case ERROR:
@ -617,7 +618,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
}
public boolean hasFlag(DiagnosticFlag flag) {
return flags != null && Arrays.asList(flags).contains(flag);
return flags.contains(flag);
}
}
@ -625,7 +626,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
* Class representing error diagnostic keys.
*/
public static final class Error extends DiagnosticInfo {
public Error(DiagnosticFlag[] flags, String prefix, String key, Object... args) {
public Error(Set<DiagnosticFlag> flags, String prefix, String key, Object... args) {
super(DiagnosticType.ERROR, flags, prefix, key, args);
}
}
@ -634,7 +635,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
* Class representing warning diagnostic keys.
*/
public static sealed class Warning extends DiagnosticInfo {
public Warning(DiagnosticFlag[] flags, String prefix, String key, Object... args) {
public Warning(Set<DiagnosticFlag> flags, String prefix, String key, Object... args) {
super(DiagnosticType.WARNING, flags, prefix, key, args);
}
}
@ -645,7 +646,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
public static final class LintWarning extends Warning {
final LintCategory category;
public LintWarning(DiagnosticFlag[] flags, LintCategory category, String prefix, String key, Object... args) {
public LintWarning(Set<DiagnosticFlag> flags, LintCategory category, String prefix, String key, Object... args) {
super(flags, prefix, key, args);
this.category = category;
}
@ -659,7 +660,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
* Class representing note diagnostic keys.
*/
public static final class Note extends DiagnosticInfo {
public Note(DiagnosticFlag[] flags, String prefix, String key, Object... args) {
public Note(Set<DiagnosticFlag> flags, String prefix, String key, Object... args) {
super(DiagnosticType.NOTE, flags, prefix, key, args);
}
}
@ -668,7 +669,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
* Class representing fragment diagnostic keys.
*/
public static final class Fragment extends DiagnosticInfo {
public Fragment(DiagnosticFlag[] flags, String prefix, String key, Object... args) {
public Fragment(Set<DiagnosticFlag> flags, String prefix, String key, Object... args) {
super(DiagnosticType.FRAGMENT, flags, prefix, key, args);
}
}
@ -715,11 +716,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
this.position = pos;
this.rewriter = rewriter;
if (diagnosticInfo.flags != null) {
for (DiagnosticFlag flag : diagnosticInfo.flags) {
this.flags.add(flag);
}
}
this.flags.addAll(diagnosticInfo.flags);
}
/**

12
src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
View File

@ -892,7 +892,7 @@ public class Log extends AbstractLog {
// Mandatory Warnings
private final EnumMap<LintCategory, MandatoryWarningAggregator> aggregators = new EnumMap<>(LintCategory.class);
private final EnumMap<LintCategory, WarningAggregator> aggregators = new EnumMap<>(LintCategory.class);
private final EnumSet<LintCategory> suppressedDeferredMandatory = EnumSet.noneOf(LintCategory.class);
@ -910,17 +910,17 @@ public class Log extends AbstractLog {
aggregators.entrySet().stream()
.filter(entry -> !suppressedDeferredMandatory.contains(entry.getKey()))
.map(Map.Entry::getValue)
.map(MandatoryWarningAggregator::aggregationNotes)
.map(WarningAggregator::aggregationNotes)
.flatMap(List::stream)
.forEach(this::report);
aggregators.clear();
}
private MandatoryWarningAggregator aggregatorFor(LintCategory lc) {
private WarningAggregator aggregatorFor(LintCategory lc) {
return switch (lc) {
case PREVIEW -> aggregators.computeIfAbsent(lc, c -> new MandatoryWarningAggregator(this, Source.instance(context), c));
case DEPRECATION -> aggregators.computeIfAbsent(lc, c -> new MandatoryWarningAggregator(this, null, c, "deprecated"));
default -> aggregators.computeIfAbsent(lc, c -> new MandatoryWarningAggregator(this, null, c));
case PREVIEW -> aggregators.computeIfAbsent(lc, c -> new WarningAggregator(this, Source.instance(context), c));
case DEPRECATION -> aggregators.computeIfAbsent(lc, c -> new WarningAggregator(this, null, c, "deprecated"));
default -> aggregators.computeIfAbsent(lc, c -> new WarningAggregator(this, null, c));
};
}

27
src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningAggregator.java → src/jdk.compiler/share/classes/com/sun/tools/javac/util/WarningAggregator.java
View File

@ -42,19 +42,12 @@ import com.sun.tools.javac.util.JCDiagnostic.Warning;
/**
* An aggregator for mandatory warnings, setting up a deferred diagnostic
* An aggregator for warnings, setting up a deferred diagnostic
* to be printed at the end of the compilation if some warnings get suppressed
* because the lint category is not enabled or too many warnings have already
* been generated.
*
* <p>
* Note that the SuppressWarnings annotation can be used to suppress warnings
* about conditions that would otherwise merit a warning. Such processing
* is done when the condition is detected, and in those cases, no call is
* made on any API to generate a warning at all. In consequence, this handler only
* Returns to handle those warnings that JLS says must be generated.
*
* <p>
* All warnings must be in the same {@link LintCategory} provided to the constructor.
*
* <p><b>This is NOT part of any supported API.
@ -62,12 +55,11 @@ import com.sun.tools.javac.util.JCDiagnostic.Warning;
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/
class MandatoryWarningAggregator {
class WarningAggregator {
/**
* The kinds of different deferred diagnostics that might be generated
* if a mandatory warning is suppressed because too many warnings have
* already been output.
* if a warning is suppressed because too many warnings have already been output.
*
* The parameter is a fragment used to build an I18N message key for Log.
*/
@ -109,18 +101,18 @@ class MandatoryWarningAggregator {
/**
* Create an aggregator for mandatory warnings.
* Create an aggregator for warnings.
*
* @param log The log on which to generate any diagnostics
* @param source Associated source file, or null for none
* @param lc The lint category for all warnings
*/
public MandatoryWarningAggregator(Log log, Source source, LintCategory lc) {
public WarningAggregator(Log log, Source source, LintCategory lc) {
this(log, source, lc, null);
}
/**
* Create an aggregator for mandatory warnings.
* Create an aggregator for warnings.
*
* @param log The log on which to generate any diagnostics
* @param source Associated source file, or null for none
@ -128,7 +120,7 @@ class MandatoryWarningAggregator {
* @param prefix A common prefix for the set of message keys for the messages
* that may be generated, or null to infer from the lint category.
*/
public MandatoryWarningAggregator(Log log, Source source, LintCategory lc, String prefix) {
public WarningAggregator(Log log, Source source, LintCategory lc, String prefix) {
this.log = log;
this.source = source;
this.prefix = prefix != null ? prefix : lc.option;
@ -136,14 +128,13 @@ class MandatoryWarningAggregator {
}
/**
* Aggregate a mandatory warning and determine whether to emit it.
* Aggregate a warning and determine whether to emit it.
*
* @param diagnostic the mandatory warning
* @param diagnostic the warning
* @param verbose whether the warning's lint category is enabled
* @return true if diagnostic should be emitted, otherwise false
*/
public boolean aggregate(JCDiagnostic diagnostic, boolean verbose) {
Assert.check(diagnostic.isMandatory());
Assert.check(diagnostic.getLintCategory() == lintCategory);
JavaFileObject currentSource = log.currentSourceFile();
if (verbose) {