src/hotspot/share/compiler/oopMap.cpp

rev 51949 : 8211279: Verify missing object equals barriers

*** 348,358 ****
          // Ignore NULL oops and decoded NULL narrow oops which
          // equal to Universe::narrow_oop_base when a narrow oop
          // implicit null check is used in compiled code.
          // The narrow_oop_base could be NULL or be the address
          // of the page below heap depending on compressed oops mode.
!         if (base_loc != NULL && *base_loc != (oop)NULL && !Universe::is_narrow_oop_base(*base_loc)) {
            derived_oop_fn(base_loc, derived_loc);
          }
          oms.next();
        }  while (!oms.is_done());
      }
--- 348,358 ----
          // Ignore NULL oops and decoded NULL narrow oops which
          // equal to Universe::narrow_oop_base when a narrow oop
          // implicit null check is used in compiled code.
          // The narrow_oop_base could be NULL or be the address
          // of the page below heap depending on compressed oops mode.
!         if (base_loc != NULL && *base_loc != NULL && !Universe::is_narrow_oop_base(*base_loc)) {
            derived_oop_fn(base_loc, derived_loc);
          }
          oms.next();
        }  while (!oms.is_done());
      }
*** 369,379 ****
        // this was allowed previously because value_value items might
        // be missing?
        guarantee(loc != NULL, "missing saved register");
        if ( omv.type() == OopMapValue::oop_value ) {
          oop val = *loc;
!         if (val == (oop)NULL || Universe::is_narrow_oop_base(val)) {
            // Ignore NULL oops and decoded NULL narrow oops which
            // equal to Universe::narrow_oop_base when a narrow oop
            // implicit null check is used in compiled code.
            // The narrow_oop_base could be NULL or be the address
            // of the page below heap depending on compressed oops mode.
--- 369,379 ----
        // this was allowed previously because value_value items might
        // be missing?
        guarantee(loc != NULL, "missing saved register");
        if ( omv.type() == OopMapValue::oop_value ) {
          oop val = *loc;
!         if (val == NULL || Universe::is_narrow_oop_base(val)) {
            // Ignore NULL oops and decoded NULL narrow oops which
            // equal to Universe::narrow_oop_base when a narrow oop
            // implicit null check is used in compiled code.
            // The narrow_oop_base could be NULL or be the address
            // of the page below heap depending on compressed oops mode.
*** 767,777 ****
  
  void DerivedPointerTable::add(oop *derived_loc, oop *base_loc) {
    assert(Universe::heap()->is_in_or_null(*base_loc), "not an oop");
    assert(derived_loc != base_loc, "Base and derived in same location");
    if (_active) {
!     assert(*derived_loc != (oop)base_loc, "location already added");
      assert(_list != NULL, "list must exist");
      intptr_t offset = value_of_loc(derived_loc) - value_of_loc(base_loc);
      // This assert is invalid because derived pointers can be
      // arbitrarily far away from their base.
      // assert(offset >= -1000000, "wrong derived pointer info");
--- 767,777 ----
  
  void DerivedPointerTable::add(oop *derived_loc, oop *base_loc) {
    assert(Universe::heap()->is_in_or_null(*base_loc), "not an oop");
    assert(derived_loc != base_loc, "Base and derived in same location");
    if (_active) {
!     assert(*derived_loc != (void*)base_loc, "location already added");
      assert(_list != NULL, "list must exist");
      intptr_t offset = value_of_loc(derived_loc) - value_of_loc(base_loc);
      // This assert is invalid because derived pointers can be
      // arbitrarily far away from their base.
      // assert(offset >= -1000000, "wrong derived pointer info");