# HG changeset patch
# User kvn
# Date 1381884466 25200
# Node ID 1263c7e17e1ce22e472a46322cbd210a8fc390d1
# Parent  8df6f123d35e796a4ec8bd1660a0f8902c8ee90f# Parent  f91a9a696e5e4f05dd4f393cd80af44e00569b20
Merge

diff -r 8df6f123d35e -r 1263c7e17e1c src/share/vm/opto/graphKit.cpp
--- a/src/share/vm/opto/graphKit.cpp	Sat Oct 12 17:26:41 2013 -0400
+++ b/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);