*** old/src/share/vm/opto/macro.cpp	Tue Mar 17 10:09:05 2015
--- new/src/share/vm/opto/macro.cpp	Tue Mar 17 10:09:04 2015

*** 2533,2543 ****
--- 2533,2543 ----
          BoolNode* bol = cmp->unique_out()->as_Bool();
          assert((bol->outcnt() == 1) && bol->unique_out()->is_If() &&
                 (bol->_test._test == BoolTest::ne), "");
          IfNode* ifn = bol->unique_out()->as_If();
          assert((ifn->outcnt() == 2) &&
!                ifn->proj_out(1)->is_uncommon_trap_proj(Deoptimization::Reason_rtm_state_change) != NULL, "");
  #endif
          Node* repl = n->in(1);
          if (!_has_locks) {
            // Remove RTM state check if there are no locks in the code.
            // Replace input to compare the same value.