src/cpu/x86/vm/macroAssembler_x86.cpp

*** 6014,6024 ****
      bind(L);
    }
  }
  
  void MacroAssembler::verify_oop(Register reg, const char* s) {
!   if (!VerifyOops) return;
  
    // Pass register number to verify_oop_subroutine
    const char* b = NULL;
    {
      ResourceMark rm;
--- 6014,6028 ----
      bind(L);
    }
  }
  
  void MacroAssembler::verify_oop(Register reg, const char* s) {
!   if (!VerifyOops || VerifyAdapterSharing) {
!     // Below address of the code string confuses VerifyAdapterSharing
!     // because it may differ between otherwise equivalent adapters.
!     return;
!   }
  
    // Pass register number to verify_oop_subroutine
    const char* b = NULL;
    {
      ResourceMark rm;
*** 6104,6114 ****
    return Address(rsp, scale_reg, scale_factor, offset);
  }
  
  
  void MacroAssembler::verify_oop_addr(Address addr, const char* s) {
!   if (!VerifyOops) return;
  
    // Address adjust(addr.base(), addr.index(), addr.scale(), addr.disp() + BytesPerWord);
    // Pass register number to verify_oop_subroutine
    const char* b = NULL;
    {
--- 6108,6122 ----
    return Address(rsp, scale_reg, scale_factor, offset);
  }
  
  
  void MacroAssembler::verify_oop_addr(Address addr, const char* s) {
!   if (!VerifyOops || VerifyAdapterSharing) {
!     // Below address of the code string confuses VerifyAdapterSharing
!     // because it may differ between otherwise equivalent adapters.
!     return;
!   }
  
    // Address adjust(addr.base(), addr.index(), addr.scale(), addr.disp() + BytesPerWord);
    // Pass register number to verify_oop_subroutine
    const char* b = NULL;
    {