Merge
authorjbachorik
Tue, 21 Jul 2015 20:37:19 +0200
changeset 31910 64d8434c9d85
parent 31909 8cbbb77c5826 (current diff)
parent 31908 73eefd070da4 (diff)
child 31911 99a420709fce
child 32018 91c91b3d50a0
child 32019 6e305dc99cc8
child 32021 5778b37712f4
Merge
--- a/jdk/src/java.base/share/classes/java/lang/Object.java	Tue Jul 21 18:38:09 2015 +0200
+++ b/jdk/src/java.base/share/classes/java/lang/Object.java	Tue Jul 21 20:37:19 2015 +0200
@@ -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();
 
     /**