archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2016-12-18 15:37:50 +01:00
commit a6fc4ec215
10 changed files with 54 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hotspot/.hgtags
View file

@ -551,3 +551,4 @@ d87d5d430c42342f0320ca7f5cbe0cbd1f9d62ba jdk-9+143
a82cb5350cad96a0b4de496afebe3ded89f27efa jdk-9+146
132a72c782071cc11ab25cc7c9ee167c3632fea4 jdk-9+147
5e4e893520ecdbd517c6ed6375f0885664fe62c4 jdk-9+148
30e1996bd55da36183434f24ed964adebf9ca71e jdk-9+149

11
hotspot/src/share/vm/classfile/classFileParser.cpp
View file

@ -4707,16 +4707,7 @@ bool ClassFileParser::verify_unqualified_name(const char* name,
for (const char* p = name; p != name + length;) {
jchar ch = *p;
if (ch < 128) {
if (ch == '.') {
// permit '.' in module names unless it's the first char, or
// preceding char is also a '.', or last char is a '.'.
if ((type != ClassFileParser::LegalModule) ||
(p == name) || (*(p-1) == '.') ||
(p == name + length - 1)) {
return false;
}
}
if (ch == ';' || ch == '[' ) {
if (ch == '.' || ch == ';' || ch == '[' ) {
return false; // do not permit '.', ';', or '['
}
if (ch == '/') {

2
hotspot/src/share/vm/classfile/classFileParser.hpp
View file

@ -72,7 +72,7 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
NOF_PUBLICITY_LEVELS
};
enum { LegalClass, LegalField, LegalMethod, LegalModule }; // used to verify unqualified names
enum { LegalClass, LegalField, LegalMethod }; // used to verify unqualified names
private:
const ClassFileStream* _stream; // Actual input stream

8
hotspot/src/share/vm/classfile/javaClasses.cpp
View file

@ -3650,7 +3650,7 @@ int java_lang_StackTraceElement::moduleName_offset;
int java_lang_StackTraceElement::moduleVersion_offset;
int java_lang_StackTraceElement::classLoaderName_offset;
int java_lang_StackTraceElement::declaringClass_offset;
int java_lang_StackTraceElement::classOrLoaderModuleClassName_offset;
int java_lang_StackTraceElement::declaringClassObject_offset;
int java_lang_StackFrameInfo::_declaringClass_offset;
int java_lang_StackFrameInfo::_memberName_offset;
int java_lang_StackFrameInfo::_bci_offset;
@ -3700,7 +3700,7 @@ void java_lang_StackTraceElement::set_classLoaderName(oop element, oop value) {
}
void java_lang_StackTraceElement::set_declaringClassObject(oop element, oop value) {
element->obj_field_put(classOrLoaderModuleClassName_offset, value);
element->obj_field_put(declaringClassObject_offset, value);
}
// Support for java_lang_StackFrameInfo
@ -3818,7 +3818,7 @@ void JavaClasses::compute_hard_coded_offsets() {
java_lang_System::static_security_offset = java_lang_System::hc_static_security_offset * x;
// java_lang_StackTraceElement
java_lang_StackTraceElement::classOrLoaderModuleClassName_offset= java_lang_StackTraceElement::hc_classOrLoaderModuleClassName_offset* x + header;
java_lang_StackTraceElement::declaringClassObject_offset = java_lang_StackTraceElement::hc_declaringClassObject_offset * x + header;
java_lang_StackTraceElement::classLoaderName_offset = java_lang_StackTraceElement::hc_classLoaderName_offset * x + header;
java_lang_StackTraceElement::moduleName_offset = java_lang_StackTraceElement::hc_moduleName_offset * x + header;
java_lang_StackTraceElement::moduleVersion_offset = java_lang_StackTraceElement::hc_moduleVersion_offset * x + header;
@ -4021,7 +4021,7 @@ void JavaClasses::check_offsets() {
// java.lang.StackTraceElement
CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, classOrLoaderModuleClassName, "Ljava/lang/Object;");
CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, declaringClassObject, "Ljava/lang/Class;");
CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, classLoaderName, "Ljava/lang/String;");
CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, moduleName, "Ljava/lang/String;");
CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, moduleVersion, "Ljava/lang/String;");

4
hotspot/src/share/vm/classfile/javaClasses.hpp
View file

@ -1297,7 +1297,7 @@ class java_lang_System : AllStatic {
class java_lang_StackTraceElement: AllStatic {
private:
enum {
hc_classOrLoaderModuleClassName_offset = 0,
hc_declaringClassObject_offset = 0,
hc_classLoaderName_offset = 1,
hc_moduleName_offset = 2,
hc_moduleVersion_offset = 3,
@ -1307,7 +1307,7 @@ class java_lang_StackTraceElement: AllStatic {
hc_lineNumber_offset = 7
};
static int classOrLoaderModuleClassName_offset;
static int declaringClassObject_offset;
static int classLoaderName_offset;
static int moduleName_offset;
static int moduleVersion_offset;

5
hotspot/src/share/vm/classfile/modules.cpp
View file

@ -51,10 +51,7 @@
static bool verify_module_name(char *module_name) {
if (module_name == NULL) return false;
int len = (int)strlen(module_name);
return (len > 0 && len <= Symbol::max_length() &&
UTF8::is_legal_utf8((unsigned char *)module_name, len, false) &&
ClassFileParser::verify_unqualified_name(module_name, len,
ClassFileParser::LegalModule));
return (len > 0 && len <= Symbol::max_length());
}
bool Modules::verify_package_name(char *package_name) {

2
hotspot/src/share/vm/prims/jvmti.xml
View file

@ -3372,7 +3372,7 @@ err = (*jvmti)-&gt;Deallocate(jvmti, stack_info);
</constant>
<constant id="JVMTI_HEAP_REFERENCE_SUPERCLASS" num="10">
Reference from a class to its superclass.
A callback is bot sent if the superclass is <code>java.lang.Object</code>.
A callback is not sent if the superclass is <code>java.lang.Object</code>.
Note: loaded classes define superclasses via a constant pool
reference, so the referenced superclass may also be reported with
a <code>JVMTI_HEAP_REFERENCE_CONSTANT_POOL</code> reference kind.

10
hotspot/test/runtime/modules/AccessCheck/ModuleLibrary.java
View file

@ -32,7 +32,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
/**
* A container of modules that acts as a ModuleFinder for testing
@ -52,12 +51,13 @@ class ModuleLibrary implements ModuleFinder {
URI uri = URI.create("module:/" + descriptor.name());
Supplier<ModuleReader> supplier = () -> {
throw new UnsupportedOperationException();
ModuleReference mref = new ModuleReference(descriptor, uri) {
@Override
public ModuleReader open() {
throw new UnsupportedOperationException();
}
};
ModuleReference mref = new ModuleReference(descriptor, uri, supplier);
namesToReference.put(name, mref);
}
}

52
hotspot/test/runtime/modules/JVMDefineModule.java
View file

@ -58,9 +58,9 @@ public class JVMDefineModule {
*/
// NULL package argument, should not throw an exception
m = ModuleHelper.ModuleObject("mymodule2", cl, new String[] { "nullpkg" });
m = ModuleHelper.ModuleObject("mymoduleTwo", cl, new String[] { "nullpkg" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, "9.0", "mymodule2/here", null);
ModuleHelper.DefineModule(m, "9.0", "mymoduleTwo/here", null);
// Null module argument, expect an NPE
try {
@ -160,7 +160,7 @@ public class JVMDefineModule {
// Expected
}
// Bad module name, expect an IAE
// Module name with ';', not allowed in java source
try {
m = ModuleHelper.ModuleObject("bad;name", cl, new String[] { "mypackage9" });
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "mypackage9" });
@ -169,7 +169,7 @@ public class JVMDefineModule {
// Expected
}
// Bad module name, expect an IAE
// Module name with leading dot, not allowed in java source
try {
m = ModuleHelper.ModuleObject(".leadingdot", cl, new String[] { "mypackage9a" });
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "mypackage9a" });
@ -178,7 +178,7 @@ public class JVMDefineModule {
// Expected
}
// Bad module name, expect an IAE
// Module name with trailing dot, not allowed in java source
try {
m = ModuleHelper.ModuleObject("trailingdot.", cl, new String[] { "mypackage9b" });
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "mypackage9b" });
@ -187,11 +187,11 @@ public class JVMDefineModule {
// Expected
}
// Bad module name, expect an IAE
m = ModuleHelper.ModuleObject("consecutive..dots", cl, new String[] { "mypackage9c" });
// Module name with consecutive dots, not allowed in java source
try {
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "mypackage9c" });
throw new RuntimeException("Failed to get expected IAE for consecutive..dots");
m = ModuleHelper.ModuleObject("trailingdot.", cl, new String[] { "mypackage9b" });
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "mypackage9b" });
throw new RuntimeException("Failed to get expected IAE for trailingdot.");
} catch(IllegalArgumentException e) {
// Expected
}
@ -207,7 +207,7 @@ public class JVMDefineModule {
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { });
// Invalid package name, expect an IAE
m = ModuleHelper.ModuleObject("module5", cl, new String[] { "your.package" });
m = ModuleHelper.ModuleObject("moduleFive", cl, new String[] { "your.package" });
try {
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "your.package" });
throw new RuntimeException("Failed to get expected IAE for your.package");
@ -218,7 +218,7 @@ public class JVMDefineModule {
}
// Invalid package name, expect an IAE
m = ModuleHelper.ModuleObject("module6", cl, new String[] { "foo" }); // Name irrelevant
m = ModuleHelper.ModuleObject("moduleSix", cl, new String[] { "foo" }); // Name irrelevant
try {
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { ";your/package" });
throw new RuntimeException("Failed to get expected IAE for ;your.package");
@ -229,7 +229,7 @@ public class JVMDefineModule {
}
// Invalid package name, expect an IAE
m = ModuleHelper.ModuleObject("module7", cl, new String[] { "foo" }); // Name irrelevant
m = ModuleHelper.ModuleObject("moduleSeven", cl, new String[] { "foo" }); // Name irrelevant
try {
ModuleHelper.DefineModule(m, "9.0", "module.name/here", new String[] { "7[743" });
throw new RuntimeException("Failed to get expected IAE for package 7[743");
@ -240,10 +240,10 @@ public class JVMDefineModule {
}
// Package named "java" defined to a class loader other than the boot or platform class loader, expect an IAE
m = ModuleHelper.ModuleObject("modulejavapkg1", cl, new String[] { "java/foo" });
m = ModuleHelper.ModuleObject("modulejavapkgOne", cl, new String[] { "java/foo" });
try {
// module m is defined to an instance of MyClassLoader class loader
ModuleHelper.DefineModule(m, "9.0", "modulejavapkg1", new String[] { "java/foo" });
ModuleHelper.DefineModule(m, "9.0", "modulejavapkgOne", new String[] { "java/foo" });
throw new RuntimeException("Failed to get expected IAE for package java/foo");
} catch(IllegalArgumentException e) {
if (!e.getMessage().contains("prohibited package name")) {
@ -252,43 +252,43 @@ public class JVMDefineModule {
}
// Package named "javabar" defined to a class loader other than the boot or platform class loader, should be ok
m = ModuleHelper.ModuleObject("modulejavapkg2", cl, new String[] { "javabar" });
m = ModuleHelper.ModuleObject("modulejavapkgTwo", cl, new String[] { "javabar" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, "9.0", "modulejavapkg2", new String[] { "javabar" });
ModuleHelper.DefineModule(m, "9.0", "modulejavapkgTwo", new String[] { "javabar" });
// Package named "java" defined to the boot class loader, should be ok
// m's type is a java.lang.Object, module is java.base
// java.base module is defined to the boot loader
ClassLoader boot_loader = m.getClass().getClassLoader();
m = ModuleHelper.ModuleObject("modulejavapkg3", boot_loader, new String[] { "java/foo" });
m = ModuleHelper.ModuleObject("modulejavapkgThree", boot_loader, new String[] { "java/foo" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, "9.0", "modulejavapkg3", new String[] { "java/foo" });
ModuleHelper.DefineModule(m, "9.0", "modulejavapkgThree", new String[] { "java/foo" });
// Package named "java" defined to the platform class loader, should be ok
// java.sql module defined to the platform class loader.
java.sql.Time jst = new java.sql.Time(45 * 1000);
ClassLoader platform_loader = jst.getClass().getClassLoader();
m = ModuleHelper.ModuleObject("modulejavapkg4", platform_loader, new String[] { "java/foo" });
m = ModuleHelper.ModuleObject("modulejavapkgFour", platform_loader, new String[] { "java/foo" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, "9.0", "modulejavapkg4", new String[] { "java/foo" });
ModuleHelper.DefineModule(m, "9.0", "modulejavapkgFour", new String[] { "java/foo" });
// module version that is null, should be okay
m = ModuleHelper.ModuleObject("module8", cl, new String[] { "a_package_8" });
m = ModuleHelper.ModuleObject("moduleEight", cl, new String[] { "a_package_8" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, null, "module8/here", new String[] { "a_package_8" });
ModuleHelper.DefineModule(m, null, "moduleEight/here", new String[] { "a_package_8" });
// module version that is "", should be okay
m = ModuleHelper.ModuleObject("module9", cl, new String[] { "a_package_9" });
m = ModuleHelper.ModuleObject("moduleNine", cl, new String[] { "a_package_9" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, "", "module9/here", new String[] { "a_package_9" });
ModuleHelper.DefineModule(m, "", "moduleNine/here", new String[] { "a_package_9" });
// module location that is null, should be okay
m = ModuleHelper.ModuleObject("module10", cl, new String[] { "a_package_10" });
m = ModuleHelper.ModuleObject("moduleTen", cl, new String[] { "a_package_10" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, "9.0", null, new String[] { "a_package_10" });
// module location that is "", should be okay
m = ModuleHelper.ModuleObject("module11", cl, new String[] { "a_package_11" });
m = ModuleHelper.ModuleObject("moduleEleven", cl, new String[] { "a_package_11" });
assertNotNull(m, "Module should not be null");
ModuleHelper.DefineModule(m, "9.0", "", new String[] { "a_package_11" });
}

17
hotspot/test/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java
View file

@ -49,6 +49,17 @@ import jdk.test.lib.Asserts;
public class JvmtiGetAllModulesTest {
static class MyModuleReference extends ModuleReference {
public MyModuleReference(ModuleDescriptor descriptor, URI uri) {
super(descriptor, uri);
}
// Trivial implementation to make the class non-abstract
public ModuleReader open() {
return null;
}
}
private static native Module[] getModulesNative();
private static Set<Module> getModulesJVMTI() {
@ -103,11 +114,7 @@ public class JvmtiGetAllModulesTest {
URI uri = URI.create("module:/" + name);
Supplier<ModuleReader> supplier = () -> {
throw new UnsupportedOperationException();
};
ModuleReference mref = new ModuleReference(descriptor, uri, supplier);
ModuleReference mref = new MyModuleReference(descriptor, uri);
namesToReference.put(name, mref);
}