# HG changeset patch
# User kvn
# Date 1381884466 25200
# Node ID bffb4cf129aafe8c08d7c559107cc80cf620278b
# Parent  a06e1f01fb6e0f2043cff485d366877a11b6a9fa# Parent  9cd6eb6944945520c74eecabb6b76d1697c8327c
Merge

diff -r a06e1f01fb6e -r bffb4cf129aa hotspot/src/share/vm/opto/graphKit.cpp
--- a/hotspot/src/share/vm/opto/graphKit.cpp	Sat Oct 12 17:26:41 2013 -0400
+++ b/hotspot/src/share/vm/opto/graphKit.cpp	Tue Oct 15 17:47:46 2013 -0700
@@ -3615,7 +3615,7 @@
   Node* marking = __ load(__ ctrl(), marking_adr, TypeInt::INT, active_type, Compile::AliasIdxRaw);
 
   // if (!marking)
-  __ if_then(marking, BoolTest::ne, zero); {
+  __ if_then(marking, BoolTest::ne, zero, unlikely); {
     BasicType index_bt = TypeX_X->basic_type();
     assert(sizeof(size_t) == type2aelembytes(index_bt), "Loading G1 PtrQueue::_index with wrong size.");
     Node* index   = __ load(__ ctrl(), index_adr, TypeX_X, index_bt, Compile::AliasIdxRaw);