Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/parse1.cpp	Wed Feb 19 20:12:43 2014 -0800
     1.2 +++ b/src/share/vm/opto/parse1.cpp	Tue Feb 25 15:11:18 2014 -0800
     1.3 @@ -1656,7 +1656,7 @@
     1.4            assert(bt1 != Type::BOTTOM, "should not be building conflict phis");
     1.5            map()->set_req(j, _gvn.transform_no_reclaim(phi));
     1.6            debug_only(const Type* bt2 = phi->bottom_type());
     1.7 -          assert(bt2->higher_equal(bt1), "must be consistent with type-flow");
     1.8 +          assert(bt2->higher_equal_speculative(bt1), "must be consistent with type-flow");
     1.9            record_for_igvn(phi);
    1.10          }
    1.11        }
    1.12 @@ -2029,7 +2029,7 @@
    1.13            !tp->klass()->is_interface()) {
    1.14          // sharpen the type eagerly; this eases certain assert checking
    1.15          if (tp->higher_equal(TypeInstPtr::NOTNULL))
    1.16 -          tr = tr->join(TypeInstPtr::NOTNULL)->is_instptr();
    1.17 +          tr = tr->join_speculative(TypeInstPtr::NOTNULL)->is_instptr();
    1.18          value = _gvn.transform(new (C) CheckCastPPNode(0,value,tr));
    1.19        }
    1.20      }