8174823: Module system implementation refresh (3/2017)
Reviewed-by: jjg, mchung
This commit is contained in:
parent
857b5db1de
commit
cc9ed3a3dd
@ -618,7 +618,6 @@ public class ClassWriter {
|
|||||||
public Void visitModuleTarget(ModuleTarget_attribute attr, ClassOutputStream out) {
|
public Void visitModuleTarget(ModuleTarget_attribute attr, ClassOutputStream out) {
|
||||||
out.writeShort(attr.os_name_index);
|
out.writeShort(attr.os_name_index);
|
||||||
out.writeShort(attr.os_arch_index);
|
out.writeShort(attr.os_arch_index);
|
||||||
out.writeShort(attr.os_version_index);
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,7 +40,6 @@ public class ModuleTarget_attribute extends Attribute {
|
|||||||
super(name_index, length);
|
super(name_index, length);
|
||||||
os_name_index = cr.readUnsignedShort();
|
os_name_index = cr.readUnsignedShort();
|
||||||
os_arch_index = cr.readUnsignedShort();
|
os_arch_index = cr.readUnsignedShort();
|
||||||
os_version_index = cr.readUnsignedShort();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -50,5 +49,4 @@ public class ModuleTarget_attribute extends Attribute {
|
|||||||
|
|
||||||
public final int os_name_index;
|
public final int os_name_index;
|
||||||
public final int os_arch_index;
|
public final int os_arch_index;
|
||||||
public final int os_version_index;
|
|
||||||
}
|
}
|
||||||
|
@ -680,12 +680,6 @@ public class AttributeWriter extends BasicWriter
|
|||||||
print("// " + getOSArch(attr));
|
print("// " + getOSArch(attr));
|
||||||
}
|
}
|
||||||
println();
|
println();
|
||||||
print("os_version: #" + attr.os_version_index);
|
|
||||||
if (attr.os_version_index != 0) {
|
|
||||||
tab();
|
|
||||||
print("// " + getOSVersion(attr));
|
|
||||||
}
|
|
||||||
println();
|
|
||||||
indent(-1);
|
indent(-1);
|
||||||
return null;
|
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
|
@Override
|
||||||
public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, Void ignore) {
|
public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, Void ignore) {
|
||||||
println("RuntimeVisibleAnnotations:");
|
println("RuntimeVisibleAnnotations:");
|
||||||
|
@ -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/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/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/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
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user