changeset 12912:a1029a7e5efe

Merge
author amurillo
date Thu, 08 Oct 2015 14:28:56 -0700
parents 85ee3ed9a3dc 4bedcee102c4
children 6bacc922bef7 dd09922656aa
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java	Thu Oct 08 17:03:07 2015 +0530
+++ b/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