Mercurial > hg > jdk9-shenandoah > jdk
changeset 12477:847552258163
Merge
author | amurillo |
---|---|
date | Fri, 24 Jul 2015 00:54:07 -0700 |
parents | 4dd09cb5f7c2 (current diff) 5f928072738e (diff) |
children | db7ebac0bc7a 9d2eb1f939c3 |
files | |
diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/share/classes/java/lang/Object.java Thu Jul 23 15:27:58 2015 -0700 +++ b/src/java.base/share/classes/java/lang/Object.java Fri Jul 24 00:54:07 2015 -0700 @@ -278,6 +278,7 @@ * @see java.lang.Object#notifyAll() * @see java.lang.Object#wait() */ + @HotSpotIntrinsicCandidate public final native void notify(); /** @@ -302,6 +303,7 @@ * @see java.lang.Object#notify() * @see java.lang.Object#wait() */ + @HotSpotIntrinsicCandidate public final native void notifyAll(); /**
--- a/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java Thu Jul 23 15:27:58 2015 -0700 +++ b/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java Fri Jul 24 00:54:07 2015 -0700 @@ -63,13 +63,18 @@ createJavaProcessBuilder( "-XX:+UseConcMarkSweepGC", // this will cause UseParNewGC to be FLAG_SET_ERGO "-XX:+PrintGCDetails", + "-XX:+UseCerealGC", // Should be ignored. "-XX:Flags=" + flagsFile.getAbsolutePath(), "-cp", System.getProperty("test.class.path"), "CheckOrigin", "-runtests"); Map<String, String> env = pb.environment(); - env.put("_JAVA_OPTIONS", "-XX:+PrintOopAddress"); + // "UseCMSGC" should be ignored. + env.put("_JAVA_OPTIONS", "-XX:+TraceExceptions -XX:+UseCMSGC"); + // "UseGOneGC" should be ignored. + env.put("JAVA_TOOL_OPTIONS", "-XX:+IgnoreUnrecognizedVMOptions " + + "-XX:+PrintVMOptions -XX:+UseGOneGC"); pb.redirectOutput(ProcessBuilder.Redirect.INHERIT); pb.redirectError(ProcessBuilder.Redirect.INHERIT); @@ -94,7 +99,10 @@ // Set on the command line checkOrigin("PrintGCDetails", Origin.VM_CREATION); // Set in _JAVA_OPTIONS - checkOrigin("PrintOopAddress", Origin.ENVIRON_VAR); + checkOrigin("TraceExceptions", Origin.ENVIRON_VAR); + // Set in JAVA_TOOL_OPTIONS + checkOrigin("IgnoreUnrecognizedVMOptions", Origin.ENVIRON_VAR); + checkOrigin("PrintVMOptions", Origin.ENVIRON_VAR); // Set in -XX:Flags file checkOrigin("PrintSafepointStatistics", Origin.CONFIG_FILE); // Set through j.l.m
--- a/test/javax/management/mxbean/LeakTest.java Thu Jul 23 15:27:58 2015 -0700 +++ b/test/javax/management/mxbean/LeakTest.java Fri Jul 24 00:54:07 2015 -0700 @@ -27,7 +27,7 @@ * @author Eamonn McManus * @modules java.desktop * java.management - * @run build LeakTest RandomMXBeanTest + * @run build LeakTest RandomMXBeanTest MerlinMXBean TigerMXBean * @run main LeakTest */