--- /dev/null	2015-06-17 17:39:34.064603000 +0200
+++ new/test/compiler/arraycopy/TestEliminatedArrayLoopPredicateCopyDeopt.java	2015-09-04 09:23:25.206530264 +0200
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8134974
+ * @summary Cannot pin eliminated arraycopy loads for deopt state in uncommon trap path if it is a loop predicate unc
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestEliminatedArrayLoopPredicateCopyDeopt
+ *
+ */
+
+public class TestEliminatedArrayLoopPredicateCopyDeopt {
+
+    static boolean test(int[] array_src) {
+        int[] array_dst = new int[10];
+        System.arraycopy(array_src, 0, array_dst, 0, 10);
+        
+        for (int i = 0; i < 100; i++) {
+            array_src[i] = i;
+        }
+        if (array_dst[0] == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    static public void main(String[] args) {
+        int[] array_src = new int[100];
+        for (int i = 0; i < 20000; i++) {
+            test(array_src);
+        }
+    }
+}
--- old/src/share/vm/opto/macro.cpp	2015-09-04 09:23:25.532123876 +0200
+++ new/src/share/vm/opto/macro.cpp	2015-09-04 09:23:25.234994695 +0200
@@ -634,8 +634,21 @@
     } else if (mem->is_ArrayCopy()) {
       Node* ctl = mem->in(0);
       if (sfpt_ctl->is_Proj() && sfpt_ctl->as_Proj()->is_uncommon_trap_proj(Deoptimization::Reason_none)) {
-        // pin the loads in the uncommon trap path
-        ctl = sfpt_ctl;
+        bool maybe_predicate = false;
+        Node* other = sfpt_ctl->as_Proj()->other_if_proj();
+        if (other != NULL) {
+          Node* other_ctl = other->unique_ctrl_out();
+          if (other_ctl != NULL && other_ctl->is_Loop()) {
+            maybe_predicate = true;
+          }
+        }
+        if (!maybe_predicate) {
+          // pin the loads in the uncommon trap path
+          // If the uncommon trap path is for predicates before the
+          // loop, predicates inserted later will require a region to
+          // be added: we can't use the uncommon trap control.
+          ctl = sfpt_ctl;
+        }
       }
       return make_arraycopy_load(mem->as_ArrayCopy(), offset, ctl, ft, ftype, alloc);
     }