src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp

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

*** 38,48 ****
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  
  void C1_MacroAssembler::inline_cache_check(Register receiver, Register iCache) {
    Label ic_miss, ic_hit;
!   verify_oop(receiver);
    int klass_offset = oopDesc::klass_offset_in_bytes();
  
    if (!ImplicitNullChecks || MacroAssembler::needs_explicit_null_check(klass_offset)) {
      if (VM_Version::has_CompareBranch()) {
        z_cgij(receiver, 0, Assembler::bcondEqual, ic_miss);
--- 38,48 ----
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  
  void C1_MacroAssembler::inline_cache_check(Register receiver, Register iCache) {
    Label ic_miss, ic_hit;
!   verify_oop(receiver, FILE_AND_LINE);
    int klass_offset = oopDesc::klass_offset_in_bytes();
  
    if (!ImplicitNullChecks || MacroAssembler::needs_explicit_null_check(klass_offset)) {
      if (VM_Version::has_CompareBranch()) {
        z_cgij(receiver, 0, Assembler::bcondEqual, ic_miss);
*** 81,91 ****
  void C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {
    const int hdr_offset = oopDesc::mark_offset_in_bytes();
    assert_different_registers(hdr, obj, disp_hdr);
    NearLabel done;
  
!   verify_oop(obj);
  
    // Load object header.
    z_lg(hdr, Address(obj, hdr_offset));
  
    // Save object being locked into the BasicObjectLock...
--- 81,91 ----
  void C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {
    const int hdr_offset = oopDesc::mark_offset_in_bytes();
    assert_different_registers(hdr, obj, disp_hdr);
    NearLabel done;
  
!   verify_oop(obj, FILE_AND_LINE);
  
    // Load object header.
    z_lg(hdr, Address(obj, hdr_offset));
  
    // Save object being locked into the BasicObjectLock...
*** 156,166 ****
    z_bre(done);
    if (!UseBiasedLocking) {
      // Load object.
      z_lg(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
    }
!   verify_oop(obj);
    // Test if object header is pointing to the displaced header, and if so, restore
    // the displaced header in the object. If the object header is not pointing to
    // the displaced header, get the object header instead.
    z_csg(disp_hdr, hdr, hdr_offset, obj);
    // If the object header was not pointing to the displaced header,
--- 156,166 ----
    z_bre(done);
    if (!UseBiasedLocking) {
      // Load object.
      z_lg(obj, Address(disp_hdr, BasicObjectLock::obj_offset_in_bytes()));
    }
!   verify_oop(obj, FILE_AND_LINE);
    // Test if object header is pointing to the displaced header, and if so, restore
    // the displaced header in the object. If the object header is not pointing to
    // the displaced header, get the object header instead.
    z_csg(disp_hdr, hdr, hdr_offset, obj);
    // If the object header was not pointing to the displaced header,
*** 276,286 ****
    //  if (CURRENT_ENV->dtrace_alloc_probes()) {
    //    assert(obj == rax, "must be");
    //    call(RuntimeAddress(Runtime1::entry_for (Runtime1::dtrace_object_alloc_id)));
    //  }
  
!   verify_oop(obj);
  }
  
  void C1_MacroAssembler::allocate_array(
    Register obj,                        // result: Pointer to array after successful allocation.
    Register len,                        // array length
--- 276,286 ----
    //  if (CURRENT_ENV->dtrace_alloc_probes()) {
    //    assert(obj == rax, "must be");
    //    call(RuntimeAddress(Runtime1::entry_for (Runtime1::dtrace_object_alloc_id)));
    //  }
  
!   verify_oop(obj, FILE_AND_LINE);
  }
  
  void C1_MacroAssembler::allocate_array(
    Register obj,                        // result: Pointer to array after successful allocation.
    Register len,                        // array length
*** 334,362 ****
    // if (CURRENT_ENV->dtrace_alloc_probes()) {
    //   assert(obj == rax, "must be");
    //   call(RuntimeAddress(Runtime1::entry_for (Runtime1::dtrace_object_alloc_id)));
    // }
  
!   verify_oop(obj);
  }
  
  
  #ifndef PRODUCT
  
  void C1_MacroAssembler::verify_stack_oop(int stack_offset) {
!   Unimplemented();
!   // if (!VerifyOops) return;
!   // verify_oop_addr(Address(SP, stack_offset + STACK_BIAS));
  }
  
  void C1_MacroAssembler::verify_not_null_oop(Register r) {
    if (!VerifyOops) return;
    NearLabel not_null;
    compareU64_and_branch(r, (intptr_t)0, bcondNotEqual, not_null);
    stop("non-null oop required");
    bind(not_null);
!   verify_oop(r);
  }
  
  void C1_MacroAssembler::invalidate_registers(Register preserve1,
                                               Register preserve2,
                                               Register preserve3) {
--- 334,361 ----
    // if (CURRENT_ENV->dtrace_alloc_probes()) {
    //   assert(obj == rax, "must be");
    //   call(RuntimeAddress(Runtime1::entry_for (Runtime1::dtrace_object_alloc_id)));
    // }
  
!   verify_oop(obj, FILE_AND_LINE);
  }
  
  
  #ifndef PRODUCT
  
  void C1_MacroAssembler::verify_stack_oop(int stack_offset) {
!   if (!VerifyOops) return;
!   verify_oop_addr(Address(Z_SP, stack_offset), FILE_AND_LINE);
  }
  
  void C1_MacroAssembler::verify_not_null_oop(Register r) {
    if (!VerifyOops) return;
    NearLabel not_null;
    compareU64_and_branch(r, (intptr_t)0, bcondNotEqual, not_null);
    stop("non-null oop required");
    bind(not_null);
!   verify_oop(r, FILE_AND_LINE);
  }
  
  void C1_MacroAssembler::invalidate_registers(Register preserve1,
                                               Register preserve2,
                                               Register preserve3) {