src/share/vm/opto/memnode.cpp

rev 5645 : 8027422: assert(_gvn.type(obj)->higher_equal(tjp)) failed: cast_up is no longer needed
Summary: type methods shouldn't always operate on speculative part
Reviewed-by:

*** 655,665 ****
               "must stay in the original alias category");
        // The type of the address must be contained in the adr_type,
        // disregarding "null"-ness.
        // (We make an exception for TypeRawPtr::BOTTOM, which is a bit bucket.)
        const TypePtr* tp_notnull = tp->join(TypePtr::NOTNULL)->is_ptr();
!       assert(cross_check->meet(tp_notnull) == cross_check,
               "real address must not escape from expected memory type");
      }
      #endif
      return tp;
    }
--- 655,665 ----
               "must stay in the original alias category");
        // The type of the address must be contained in the adr_type,
        // disregarding "null"-ness.
        // (We make an exception for TypeRawPtr::BOTTOM, which is a bit bucket.)
        const TypePtr* tp_notnull = tp->join(TypePtr::NOTNULL)->is_ptr();
!       assert(cross_check->meet(tp_notnull) == cross_check->remove_speculative(),
               "real address must not escape from expected memory type");
      }
      #endif
      return tp;
    }
*** 1679,1689 ****
          && (_type->isa_vect() == NULL)
          && Opcode() != Op_LoadKlass && Opcode() != Op_LoadNKlass) {
        // t might actually be lower than _type, if _type is a unique
        // concrete subclass of abstract class t.
        if (off_beyond_header) {  // is the offset beyond the header?
!         const Type* jt = t->join(_type);
          // In any case, do not allow the join, per se, to empty out the type.
          if (jt->empty() && !t->empty()) {
            // This can happen if a interface-typed array narrows to a class type.
            jt = _type;
          }
--- 1679,1689 ----
          && (_type->isa_vect() == NULL)
          && Opcode() != Op_LoadKlass && Opcode() != Op_LoadNKlass) {
        // t might actually be lower than _type, if _type is a unique
        // concrete subclass of abstract class t.
        if (off_beyond_header) {  // is the offset beyond the header?
!         const Type* jt = t->join(_type, true);
          // In any case, do not allow the join, per se, to empty out the type.
          if (jt->empty() && !t->empty()) {
            // This can happen if a interface-typed array narrows to a class type.
            jt = _type;
          }