Mercurial > hg > openjdk > jdk9 > langtools
changeset 4059:88cdf1b96e73
8174823: Module system implementation refresh (3/2017)
Reviewed-by: jjg, mchung
author | alanb |
---|---|
date | Wed, 22 Mar 2017 16:27:39 +0000 |
parents | efaff4abb139 |
children | aa10ddad1b6e |
files | src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java test/ProblemList.txt |
diffstat | 4 files changed, 1 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java Thu Mar 16 16:34:37 2017 +0000 +++ b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java Wed Mar 22 16:27:39 2017 +0000 @@ -618,7 +618,6 @@ public Void visitModuleTarget(ModuleTarget_attribute attr, ClassOutputStream out) { out.writeShort(attr.os_name_index); out.writeShort(attr.os_arch_index); - out.writeShort(attr.os_version_index); return null; }
--- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java Thu Mar 16 16:34:37 2017 +0000 +++ b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java Wed Mar 22 16:27:39 2017 +0000 @@ -40,7 +40,6 @@ super(name_index, length); os_name_index = cr.readUnsignedShort(); os_arch_index = cr.readUnsignedShort(); - os_version_index = cr.readUnsignedShort(); } @Override @@ -50,5 +49,4 @@ public final int os_name_index; public final int os_arch_index; - public final int os_version_index; }
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java Thu Mar 16 16:34:37 2017 +0000 +++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java Wed Mar 22 16:27:39 2017 +0000 @@ -680,12 +680,6 @@ print("// " + getOSArch(attr)); } println(); - print("os_version: #" + attr.os_version_index); - if (attr.os_version_index != 0) { - tab(); - print("// " + getOSVersion(attr)); - } - println(); indent(-1); return null; } @@ -706,14 +700,6 @@ } } - private String getOSVersion(ModuleTarget_attribute attr) { - try { - return constant_pool.getUTF8Value(attr.os_version_index); - } catch (ConstantPoolException e) { - return report(e); - } - } - @Override public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, Void ignore) { println("RuntimeVisibleAnnotations:");
--- a/test/ProblemList.txt Thu Mar 16 16:34:37 2017 +0000 +++ b/test/ProblemList.txt Wed Mar 22 16:27:39 2017 +0000 @@ -54,6 +54,7 @@ tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java 8057687 generic-all emit correct byte code an attributes for type annotations tools/javac/warnings/suppress/TypeAnnotations.java 8057683 generic-all improve ordering of errors with type annotations tools/javac/modules/T8159439/NPEForModuleInfoWithNonZeroSuperClassTest.java 8160396 generic-all current version of jtreg needs a new promotion to include lastes version of ASM +tools/javac/platform/PlatformProviderTest.java 8176801 generic-all fails due to warnings printed to stderr ########################################################################### #