diff --git a/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties b/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties --- a/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties +++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties @@ -13,6 +13,8 @@ pack.code.attribute.CharacterRangeTable = NH[PHPOHIIH] pack.class.attribute.SourceID = RUH pack.class.attribute.CompilationID = RUH +pack.class.attribute.NestHost = RCH +pack.class.attribute.NestMembers = NH[RCH] # Note: Zero-length ("marker") attributes do not need to be specified here. # They are automatically defined to have an empty layout. diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -731,14 +731,6 @@ # core_tools tools/pack200/CommandLineTests.java 8059906 generic-all -tools/pack200/AttributeTests.java 8187645 generic-all -tools/pack200/BandIntegrity.java 8187645 generic-all -tools/pack200/InstructionTests.java 8187645 generic-all -tools/pack200/ModuleAttributes.java 8187645 generic-all -tools/pack200/MultiRelease.java 8187645 generic-all -tools/pack200/Pack200Test.java 8187645 generic-all -tools/pack200/TestNormal.java 8187645 generic-all -tools/pack200/typeannos/TestTypeAnnotations.java 8187645 generic-all tools/launcher/FXLauncherTest.java 8068049 linux-all,macosx-all diff --git a/test/jdk/tools/pack200/pack200-verifier/make/build.xml b/test/jdk/tools/pack200/pack200-verifier/make/build.xml --- a/test/jdk/tools/pack200/pack200-verifier/make/build.xml +++ b/test/jdk/tools/pack200/pack200-verifier/make/build.xml @@ -22,18 +22,18 @@ - + diff --git a/test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java b/test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java --- a/test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java +++ b/test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java @@ -85,6 +85,8 @@ import com.sun.tools.classfile.ModuleResolution_attribute; import com.sun.tools.classfile.ModuleTarget_attribute; import com.sun.tools.classfile.ModulePackages_attribute; +import com.sun.tools.classfile.NestHost_attribute; +import com.sun.tools.classfile.NestMembers_attribute; import com.sun.tools.classfile.Opcode; import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute; import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute; @@ -1566,6 +1568,30 @@ p.add(e); return null; } + + @Override + public Element visitNestHost(NestHost_attribute attr, Element p) { + String aname = x.getCpString(attr.attribute_name_index); + String hname = x.getCpString(attr.top_index); + Element se = new Element(aname); + se.add(hname); + se.trimToSize(); + p.add(se); + return null; + } + + @Override + public Element visitNestMembers(NestMembers_attribute attr, Element p) { + Element ee = new Element(x.getCpString(attr.attribute_name_index)); + for (int idx : attr.members_indexes) { + Element n = new Element("Item"); + n.setAttr("class", x.getCpString(idx)); + ee.add(n); + } + ee.trimToSize(); + p.add(ee); + return null; + } } class StackMapVisitor implements StackMapTable_attribute.stack_map_frame.Visitor {