changeset 18615:c2da0aa9e675

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 04 Dec 2014 13:48:10 +0100
parents c307546c7b0a (current diff) 20e498cfa409 (diff)
children b0fabf67614a 0aec14bcf006
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySnippets.java	Thu Dec 04 13:42:56 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/arraycopy/ArrayCopySnippets.java	Thu Dec 04 13:48:10 2014 +0100
@@ -191,7 +191,8 @@
         Object nonNullDest = guardingNonNull(dest);
         checkLimits(nonNullSrc, srcPos, nonNullDest, destPos, length);
         if (probability(SLOW_PATH_PROBABILITY, nonNullSrc == nonNullDest)) {
-            System.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length);
+            // no storecheck required.
+            ArrayCopyCallNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, Kind.Object, false, false);
         } else {
             KlassPointer destElemKlass = loadHub(nonNullDest);
             checkcastArraycopyHelper(srcPos, destPos, length, nonNullSrc, nonNullDest, destElemKlass);