Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hotspot/src/share/vm/opto/macro.cpp
changeset 30248 5c6dacbd17ae
parent 30244 d4e471395ff5
parent 30183 a6588c0a3259
child 30629 b6e5ad2f18d5 
--- a/hotspot/src/share/vm/opto/macro.cpp	Fri Apr 17 10:53:31 2015 +0200
+++ b/hotspot/src/share/vm/opto/macro.cpp	Fri Apr 17 14:37:20 2015 -0700
@@ -2543,7 +2543,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) {
jdk-sandbox