# HG changeset patch
# User amurillo
# Date 1437724447 25200
# Node ID 99a420709fcee22a1e5425d132041364d99818f0
# Parent  f55df5cfe11c97e4b58998b76f5bd00a73cde12d# Parent  64d8434c9d85559721447ef689bb5100e3a2085b
Merge

diff -r f55df5cfe11c -r 99a420709fce jdk/src/java.base/share/classes/java/lang/Object.java
--- a/jdk/src/java.base/share/classes/java/lang/Object.java	Wed Jul 05 20:43:22 2017 +0200
+++ b/jdk/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();
 
     /**
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/BreakpointTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/BreakpointWithFullGC.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/CatchAllTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/CatchCaughtTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/CatchPatternTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/CommandCommentDelimiter.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/DeoptimizeWalk.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/ExceptionEvents.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/JdbExprTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/JdbMissStep.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/JdbVarargsTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/MixedSuspendTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/NotAField.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefineAbstractClass.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefineAnnotation.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefineClearBreakpoint.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefineException.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefineFinal.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefinePop.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefineStep.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/RedefineTTYLineNumber.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/SimulResumerTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/StringConvertTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/jdi/sde/FilterMangleTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java	Wed Jul 05 20:43:22 2017 +0200
+++ b/jdk/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
diff -r f55df5cfe11c -r 99a420709fce jdk/test/com/sun/tools/attach/BasicTests.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/java/lang/ClassLoader/Assert.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/java/lang/instrument/ManifestTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/java/lang/instrument/PremainClass/InheritAgent0101.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/java/lang/instrument/RedefineBigClass.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/java/lang/instrument/RetransformBigClass.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/javax/management/monitor/ReflectionExceptionTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/javax/management/mxbean/GenericArrayTypeTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/javax/management/mxbean/LeakTest.java
--- a/jdk/test/javax/management/mxbean/LeakTest.java	Wed Jul 05 20:43:22 2017 +0200
+++ b/jdk/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
  */
 
diff -r f55df5cfe11c -r 99a420709fce jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh
diff -r f55df5cfe11c -r 99a420709fce jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/sun/tools/jmap/BasicJMapTest.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/sun/tools/jstatd/TestJstatdDefaults.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/sun/tools/jstatd/TestJstatdPort.java
diff -r f55df5cfe11c -r 99a420709fce jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java