--- a/hotspot/src/share/vm/opto/parse1.cpp Thu Jan 23 01:23:23 2014 +0400
+++ b/hotspot/src/share/vm/opto/parse1.cpp Fri Jan 24 09:31:53 2014 +0100
@@ -1649,7 +1649,7 @@
assert(bt1 != Type::BOTTOM, "should not be building conflict phis");
map()->set_req(j, _gvn.transform_no_reclaim(phi));
debug_only(const Type* bt2 = phi->bottom_type());
- assert(bt2->higher_equal(bt1), "must be consistent with type-flow");
+ assert(bt2->higher_equal_speculative(bt1), "must be consistent with type-flow");
record_for_igvn(phi);
}
}
@@ -2022,7 +2022,7 @@
!tp->klass()->is_interface()) {
// sharpen the type eagerly; this eases certain assert checking
if (tp->higher_equal(TypeInstPtr::NOTNULL))
- tr = tr->join(TypeInstPtr::NOTNULL)->is_instptr();
+ tr = tr->join_speculative(TypeInstPtr::NOTNULL)->is_instptr();
value = _gvn.transform(new (C) CheckCastPPNode(0,value,tr));
}
}