*** old/src/cpu/sparc/vm/compiledIC_sparc.cpp	Thu Nov  3 14:16:00 2016
--- new/src/cpu/sparc/vm/compiledIC_sparc.cpp	Thu Nov  3 14:16:00 2016

*** 83,99 ****
--- 83,99 ----
  // Relocation entries for call stub, compiled java to interpreter.
  int CompiledStaticCall::reloc_to_interp_stub() {
    return 10;  // 4 in emit_java_to_interp + 1 in Java_Static_Call
  }
  
! void CompiledStaticCall::set_to_interpreted(methodHandle callee, address entry) {
!   address stub = find_stub();
! void CompiledDirectStaticCall::set_to_interpreted(const methodHandle& callee, address entry) {
!   address stub = find_stub(/*is_aot*/ false);
    guarantee(stub != NULL, "stub not found");
  
    if (TraceICs) {
      ResourceMark rm;
!     tty->print_cr("CompiledStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s",
!     tty->print_cr("CompiledDirectStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s",
                    p2i(instruction_address()),
                    callee->name_and_sig_as_C_string());
    }
  
    // Creation also verifies the object.

*** 116,126 ****
--- 116,126 ----
  
    // Update jump to call.
    set_destination_mt_safe(stub);
  }
  
! void CompiledStaticCall::set_stub_to_clean(static_stub_Relocation* static_stub) {
! void CompiledDirectStaticCall::set_stub_to_clean(static_stub_Relocation* static_stub) {
    assert (CompiledIC_lock->is_locked() || SafepointSynchronize::is_at_safepoint(), "mt unsafe call");
    // Reset stub.
    address stub = static_stub->addr();
    assert(stub != NULL, "stub not found");
    // Creation also verifies the object.

*** 132,150 ****
--- 132,150 ----
  
  //-----------------------------------------------------------------------------
  // Non-product mode code
  #ifndef PRODUCT
  
! void CompiledStaticCall::verify() {
! void CompiledDirectStaticCall::verify() {
    // Verify call.
!   NativeCall::verify();
!   _call->verify();
    if (os::is_MP()) {
!     _call->verify_alignment();
    }
  
    // Verify stub.
!   address stub = find_stub(/*is_aot*/ false);
    assert(stub != NULL, "no stub found for static call");
    // Creation also verifies the object.
    NativeMovConstReg* method_holder = nativeMovConstReg_at(stub);
    NativeJump*        jump          = nativeJump_at(method_holder->next_instruction_address());