src/cpu/sparc/vm/templateInterpreter_sparc.cpp

*** 1885,1894 ****
--- 1885,1915 ----
    // The method data pointer was incremented already during
    // call profiling. We have to restore the mdp for the current bcp.
    if (ProfileInterpreter) {
      __ set_method_data_pointer_for_bcp();
    }
+ 
+ #if INCLUDE_JVMTI
+   if (EnableInvokeDynamic) {
+     Label L_done;
+ 
+     __ ldub(Address(Lbcp, 0), G1_scratch);  // Load current bytecode
+     __ cmp_and_br_short(G1_scratch, Bytecodes::_invokestatic, Assembler::notEqual, Assembler::pn, L_done);
+ 
+     // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
+     // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL.
+ 
+     __ call_VM(G1_scratch, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), I0, Lmethod, Lbcp);
+ 
+     __ br_null(G1_scratch, false, Assembler::pn, L_done);
+     __ delayed()->nop();
+ 
+     __ st_ptr(G1_scratch, Lesp, wordSize);
+     __ bind(L_done);
+   }
+ #endif // INCLUDE_JVMTI
+ 
    // Resume bytecode interpretation at the current bcp
    __ dispatch_next(vtos);
    // end of JVMTI PopFrame support
  
    Interpreter::_remove_activation_entry = __ pc();