Merge
authoramurillo
Thu, 08 Oct 2015 14:28:56 -0700
changeset 33262 65de268ae879
parent 32930 7616af8ec145 (current diff)
parent 33261 c8a39258f284 (diff)
child 33269 df48b609f5b8
child 33271 e7aac997b492
Merge
--- a/jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java	Thu Oct 08 17:03:07 2015 +0530
+++ b/jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java	Thu Oct 08 14:28:56 2015 -0700
@@ -28,8 +28,8 @@
 import java.lang.annotation.*;
 
 /**
- * The {@code @HotSpotIntrinsicCandidate} annotation is specific to the Oracle Java
- * HotSpot Virtual Machine implementation and indicates that an annotated method
+ * The {@code @HotSpotIntrinsicCandidate} annotation is specific to the
+ * HotSpot Virtual Machine. It indicates that an annotated method
  * may be (but is not guaranteed to be) intrinsified by the HotSpot VM. A method
  * is intrinsified if the HotSpot VM replaces the annotated method with hand-written
  * assembly and/or hand-written compiler IR -- a compiler intrinsic -- to improve