src/hotspot/cpu/s390/sharedRuntime_s390.cpp

rev 57534 : 8236555: [s390] Fix VerifyOops
Reviewed-by:

*** 890,902 ****
        assert(r->is_valid(), "bad oop arg");
  
        if (r->is_stack()) {
          __ z_lg(Z_R0_scratch,
                  Address(Z_SP, r->reg2stack() * VMRegImpl::stack_slot_size + wordSize));
!         __ verify_oop(Z_R0_scratch);
        } else {
!         __ verify_oop(r->as_Register());
        }
      }
    }
  }
  
--- 890,902 ----
        assert(r->is_valid(), "bad oop arg");
  
        if (r->is_stack()) {
          __ z_lg(Z_R0_scratch,
                  Address(Z_SP, r->reg2stack() * VMRegImpl::stack_slot_size + wordSize));
!         __ verify_oop(Z_R0_scratch, FILE_AND_LINE);
        } else {
!         __ verify_oop(r->as_Register(), FILE_AND_LINE);
        }
      }
    }
  }
  
*** 2684,2694 ****
      // Check the pointers.
      if (!ImplicitNullChecks || MacroAssembler::needs_explicit_null_check(klass_offset)) {
        __ z_ltgr(Z_ARG1, Z_ARG1);
        __ z_bre(ic_miss);
      }
!     __ verify_oop(Z_ARG1);
  
      // Check ic: object class <-> cached class
      // Compress cached class for comparison. That's more efficient.
      if (UseCompressedClassPointers) {
        __ z_lg(Z_R11, holder_klass_offset, Z_method);             // Z_R11 is overwritten a few instructions down anyway.
--- 2684,2694 ----
      // Check the pointers.
      if (!ImplicitNullChecks || MacroAssembler::needs_explicit_null_check(klass_offset)) {
        __ z_ltgr(Z_ARG1, Z_ARG1);
        __ z_bre(ic_miss);
      }
!     __ verify_oop(Z_ARG1, FILE_AND_LINE);
  
      // Check ic: object class <-> cached class
      // Compress cached class for comparison. That's more efficient.
      if (UseCompressedClassPointers) {
        __ z_lg(Z_R11, holder_klass_offset, Z_method);             // Z_R11 is overwritten a few instructions down anyway.
*** 2953,2963 ****
  
  
  #ifdef ASSERT
    // verify that there is really an exception oop in JavaThread
    __ z_lg(Z_ARG1, Address(Z_thread, JavaThread::exception_oop_offset()));
!   __ verify_oop(Z_ARG1);
  
    // verify that there is no pending exception
    __ asm_assert_mem8_is_zero(in_bytes(Thread::pending_exception_offset()), Z_thread,
                               "must not have pending exception here", __LINE__);
  #endif
--- 2953,2963 ----
  
  
  #ifdef ASSERT
    // verify that there is really an exception oop in JavaThread
    __ z_lg(Z_ARG1, Address(Z_thread, JavaThread::exception_oop_offset()));
!   __ MacroAssembler::verify_oop(Z_ARG1, FILE_AND_LINE);
  
    // verify that there is no pending exception
    __ asm_assert_mem8_is_zero(in_bytes(Thread::pending_exception_offset()), Z_thread,
                               "must not have pending exception here", __LINE__);
  #endif