stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8174823: Module system implementation refresh (3/2017)

Browse Source 
Reviewed-by: jjg, mchung
This commit is contained in:
Alan Bateman 2017-03-22 16:27:39 +00:00
parent 857b5db1de
commit cc9ed3a3dd
4 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java
View File

@ -618,7 +618,6 @@ public class ClassWriter {
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;
}

2
langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java
View File

@ -40,7 +40,6 @@ public class ModuleTarget_attribute extends Attribute {
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 class ModuleTarget_attribute extends Attribute {
public final int os_name_index;
public final int os_arch_index;
public final int os_version_index;
}

14
langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
View File

@ -680,12 +680,6 @@ public class AttributeWriter extends BasicWriter
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 @@ public class AttributeWriter extends BasicWriter
}
}
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:");

1
langtools/test/ProblemList.txt
View File

@ -54,6 +54,7 @@ tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
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
###########################################################################
#