src/hotspot/cpu/sparc/templateTable_sparc.cpp

*** 3054,3084 ****
    const Register Rscratch    = G4_scratch;
    assert_different_registers(Rscratch, G5_method);
  
    prepare_invoke(byte_no, Rinterface, Rret, Rmethod, O0_recv, O1_flags);
  
    // Check for private method invocation - indicated by vfinal
    Label notVFinal;
    __ set((1 << ConstantPoolCacheEntry::is_vfinal_shift), Rscratch);
    __ btst(O1_flags, Rscratch);
    __ br(Assembler::zero, false, Assembler::pt, notVFinal);
    __ delayed()->nop();
  
!    __ null_check(O0_recv);
  
!   {
      Register Rcall = Rinterface;
      __ mov(Rmethod, G5_method);
      assert_different_registers(Rcall, G5_method, Gargs, Rret);
  
      __ profile_arguments_type(G5_method, Rcall, Gargs, true);
      __ profile_final_call(Rscratch);
      __ call_from_interpreter(Rcall, Gargs, Rret);
    }
   __ bind(notVFinal);
  
!   // get receiver klass
    __ null_check(O0_recv, oopDesc::klass_offset_in_bytes());
    __ load_klass(O0_recv, O2_Klass);
  
    // Special case of invokeinterface called for virtual method of
    // java.lang.Object.  See cpCacheOop.cpp for details.
--- 3054,3097 ----
    const Register Rscratch    = G4_scratch;
    assert_different_registers(Rscratch, G5_method);
  
    prepare_invoke(byte_no, Rinterface, Rret, Rmethod, O0_recv, O1_flags);
  
+   Label L_no_such_interface;
+ 
    // Check for private method invocation - indicated by vfinal
    Label notVFinal;
+   {
      __ set((1 << ConstantPoolCacheEntry::is_vfinal_shift), Rscratch);
      __ btst(O1_flags, Rscratch);
      __ br(Assembler::zero, false, Assembler::pt, notVFinal);
      __ delayed()->nop();
  
!     // get receiver klass - this is also a null check
!     __ null_check(O0_recv, oopDesc::klass_offset_in_bytes());
!     __ load_klass(O0_recv, O2_Klass);
  
!     Label subtype;
!     Register Rtemp = O1_flags;
!     __ check_klass_subtype(O2_Klass, Rinterface, Rscratch, Rtemp, subtype);
!     // If we get here the typecheck failed
!     __ ba(L_no_such_interface);
!     __ delayed()->nop();
!     __ bind(subtype);
! 
!     // do the call
      Register Rcall = Rinterface;
      __ mov(Rmethod, G5_method);
      assert_different_registers(Rcall, G5_method, Gargs, Rret);
  
      __ profile_arguments_type(G5_method, Rcall, Gargs, true);
      __ profile_final_call(Rscratch);
      __ call_from_interpreter(Rcall, Gargs, Rret);
    }
    __ bind(notVFinal);
  
!   // get receiver klass - this is also a null check
    __ null_check(O0_recv, oopDesc::klass_offset_in_bytes());
    __ load_klass(O0_recv, O2_Klass);
  
    // Special case of invokeinterface called for virtual method of
    // java.lang.Object.  See cpCacheOop.cpp for details.
*** 3094,3105 ****
  
    __ bind(notMethod);
  
    Register Rtemp = O1_flags;
  
-   Label L_no_such_interface;
- 
    // Receiver subtype check against REFC.
    __ lookup_interface_method(// inputs: rec. class, interface, itable index
                               O2_Klass, Rinterface, noreg,
                               // outputs: temp reg1, temp reg2, temp reg3
                               G5_method, Rscratch, Rtemp,
--- 3107,3116 ----