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

8342036: [lworld] tools/javap/UndefinedAccessFlagTest.java fails after merge of jdk-24+4 #1310

Closed
wants to merge 1 commit into from
+7 −8
Closed

8342036: [lworld] tools/javap/UndefinedAccessFlagTest.java fails after merge of jdk-24+4 #1310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
View file
Original file line number Diff line number Diff line change
@@ -450,7 +450,7 @@ protected void writeField(FieldModel f) {

if (options.verbose)
writeList(String.format("flags: (0x%04x) ", flags.flagsMask()),
flagsReportUnknown(flags).stream().map(fl -> "ACC_" + fl.toString()).toList(),
flagsReportUnknown(flags).stream().map(fl -> "ACC_" + fl.name()).toList(),
"\n");

if (options.showAllAttrs) {
@@ -810,16 +810,16 @@ private Set<String> getClassModifiers(AccessFlags flags) {
return getModifiers(set);
}

private static Set<String> getClassModifiers(AccessFlags flags, int majorVersion, int minorVersion) {
private Set<String> getClassModifiers(AccessFlags flags, int majorVersion, int minorVersion) {
boolean previewClassFile = minorVersion == ClassFile.PREVIEW_MINOR_VERSION;
Set<AccessFlag> flagSet = flags.flags();
Set<AccessFlag> flagSet = flagsReportUnknown(flags);
if (flagSet.contains(AccessFlag.INTERFACE)) {
flagSet = EnumSet.copyOf(flagSet);
flagSet.remove(AccessFlag.ABSTRACT);
} else if (Source.isSupported(Source.Feature.VALUE_CLASSES, majorVersion) && previewClassFile) {
Set<String> classModifers = getModifiers(flagSet);
classModifers.add("value");
return classModifers;
Set<String> classModifers = getModifiers(flagSet);
classModifers.add("value");
return classModifers;
}
return getModifiers(flagSet);
}
1 change: 0 additions & 1 deletion test/langtools/ProblemList.txt
View file
Original file line number Diff line number Diff line change
@@ -67,7 +67,6 @@ tools/javac/modules/SourceInSymlinkTest.java
# javap

tools/javap/output/RepeatingTypeAnnotations.java 8057687 generic-all emit correct byte code an attributes for type annotations
tools/javap/UndefinedAccessFlagTest.java 8342036 generic-all
###########################################################################
#
# jdeps
2 changes: 1 addition & 1 deletion test/langtools/tools/javap/UndefinedAccessFlagTest.java
View file
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ void test(TestLocation location) throws Throwable {
});
case InnerClassesAttribute attr when location == TestLocation.INNER_CLASS -> cb
.with(InnerClassesAttribute.of(attr.classes().stream()
.map(ic -> InnerClassInfo.of(ic.innerClass(), ic.outerClass(), ic.innerName(), ic.flagsMask() | 0x0020))
.map(ic -> InnerClassInfo.of(ic.innerClass(), ic.outerClass(), ic.innerName(), ic.flagsMask() | 0x0050))
.toList()));
default -> cb.with(ce);
}