1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2017-02-18 03:23:29 +01:00
commit 9ff76f96b2
9 changed files with 19 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/java.base/share/classes/module-info.java
View File

@ -136,7 +136,7 @@ module java.base {
jdk.jartool,
jdk.jlink,
jdk.scripting.nashorn,
jdk.vm.ci;
jdk.internal.vm.ci;
exports jdk.internal.org.objectweb.asm.tree to
jdk.jlink;
exports jdk.internal.org.objectweb.asm.util to
@ -175,7 +175,7 @@ module java.base {
jdk.scripting.nashorn,
jdk.scripting.nashorn.shell,
jdk.unsupported,
jdk.vm.ci;
jdk.internal.vm.ci;
exports jdk.internal.perf to
java.desktop,
java.management,
@ -193,7 +193,7 @@ module java.base {
jdk.unsupported;
exports jdk.internal.vm.annotation to
jdk.unsupported,
jdk.vm.ci;
jdk.internal.vm.ci;
exports jdk.internal.util.jar to
jdk.jartool,
jdk.jdeps,

2
jdk/src/java.base/share/lib/security/default.policy
View File

@ -214,6 +214,6 @@ grant {
permission java.lang.RuntimePermission "accessClassInPackage.com.apple.*";
};
grant codeBase "jrt:/jdk.vm.compiler" {
grant codeBase "jrt:/jdk.internal.vm.compiler" {
permission java.security.AllPermission;
};

12
jdk/src/java.base/unix/classes/module-info.java.extra
View File

@ -23,14 +23,14 @@
* questions.
*/
// jdk.vm.compiler uses Unsafe and VM classes from jdk.internal.misc
exports jdk.internal.misc to jdk.vm.compiler;
opens jdk.internal.misc to jdk.vm.compiler;
// jdk.internal.vm.compiler uses Unsafe and VM classes from jdk.internal.misc
exports jdk.internal.misc to jdk.internal.vm.compiler;
opens jdk.internal.misc to jdk.internal.vm.compiler;
// jdk.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics
opens com.sun.crypto.provider to jdk.vm.compiler;
// jdk.internal.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics
opens com.sun.crypto.provider to jdk.internal.vm.compiler;
exports jdk.internal.module to jdk.vm.compiler;
exports jdk.internal.module to jdk.internal.vm.compiler;
// AOT uses jdk.internal.misc.Unsafe
exports jdk.internal.misc to jdk.aot;

1
jdk/test/ProblemList.txt
View File

@ -147,6 +147,7 @@ java/lang/management/MemoryMXBean/PendingAllGC.sh 8158837 generic-
com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957 aix-all
com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java 8030957 aix-all
sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java 8174734 generic-all
############################################################################

4
jdk/test/sun/management/jdp/JdpDefaultsTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,7 +33,7 @@
* @library /lib/testlibrary
* @modules jdk.management.agent/sun.management.jdp
* @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher
* @run main JdpDefaultsTest
* @run main/othervm JdpDefaultsTest
*/
public class JdpDefaultsTest extends DynamicLauncher {

2
jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java
View File

@ -29,7 +29,7 @@
* @library /lib/testlibrary
* @modules jdk.management.agent/sun.management.jdp
* @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpJmxRemoteDynamicPortTestCase DynamicLauncher
* @run main JdpJmxRemoteDynamicPortTest
* @run main/othervm JdpJmxRemoteDynamicPortTest
*/
import java.lang.management.ManagementFactory;

4
jdk/test/sun/management/jdp/JdpOffTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,7 @@
* @library /lib/testlibrary
* @modules jdk.management.agent/sun.management.jdp
* @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher
* @run main JdpOffTest
* @run main/othervm JdpOffTest
*/

4
jdk/test/sun/management/jdp/JdpSpecificAddressTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,7 +33,7 @@
* @library /lib/testlibrary
* @modules jdk.management.agent/sun.management.jdp
* @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher
* @run main JdpSpecificAddressTest
* @run main/othervm JdpSpecificAddressTest
*/

34
jdk/test/sun/tools/jhsdb/BasicLauncherTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -85,7 +85,6 @@ public class BasicLauncherTest {
try (OutputStream out = toolProcess.getOutputStream()) {
out.write("universe\n".getBytes());
out.write("printmdo -a\n".getBytes());
out.write("quit\n".getBytes());
}
@ -94,13 +93,6 @@ public class BasicLauncherTest {
try (BufferedReader reader =
new BufferedReader(new InputStreamReader(toolProcess.getInputStream()))) {
String line;
String unexpectedMsg =
"One or more of 'VirtualCallData', 'CounterData', " +
"'ReceiverTypeData', 'bci', 'MethodData' " +
"or 'java/lang/Object' not found";
boolean knownClassFound = false;
boolean knownProfileDataTypeFound = false;
boolean knownTokensFound = false;
while ((line = reader.readLine()) != null) {
line = line.trim();
@ -110,27 +102,6 @@ public class BasicLauncherTest {
unexpected = new RuntimeException("CollectedHeap type should be known.");
break;
}
else if (line.contains("missing reason for ")) {
unexpected = new RuntimeException("missing reason for ");
break;
}
if (line.contains("VirtualCallData") ||
line.contains("CounterData") ||
line.contains("ReceiverTypeData")) {
knownProfileDataTypeFound = true;
}
if (line.contains("bci") ||
line.contains("MethodData")) {
knownTokensFound = true;
}
if (line.contains("java/lang/Object")) {
knownClassFound = true;
}
}
if ((knownClassFound == false) ||
(knownTokensFound == false) ||
(knownProfileDataTypeFound == false)) {
unexpected = new RuntimeException(unexpectedMsg);
}
}
@ -144,9 +115,6 @@ public class BasicLauncherTest {
throw unexpected;
}
if (unexpected != null) {
throw unexpected;
}
} catch (Exception ex) {
throw new RuntimeException("Test ERROR " + ex, ex);
} finally {