--- a/hotspot/src/share/vm/opto/macro.cpp	Sat Mar 14 16:13:48 2015 +0000
+++ b/hotspot/src/share/vm/opto/macro.cpp	Tue Mar 17 10:06:31 2015 +0100
@@ -2535,7 +2535,7 @@
                (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), "");
+               ifn->proj_out(1)->is_uncommon_trap_proj(Deoptimization::Reason_rtm_state_change) != NULL, "");
 #endif
         Node* repl = n->in(1);
         if (!_has_locks) {