src/share/vm/code/nmethod.cpp

rev 1081 : imported patch indy-cleanup-6893081.patch
rev 1083 : [mq]: indy.compiler.inline.patch

*** 1713,1725 ****
  // called with a frame corresponding to a Java invoke
  void nmethod::preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) {
    if (!method()->is_native()) {
      SimpleScopeDesc ssd(this, fr.pc());
      Bytecode_invoke* call = Bytecode_invoke_at(ssd.method(), ssd.bci());
!     bool is_static = call->is_invokestatic();
      symbolOop signature = call->signature();
!     fr.oops_compiled_arguments_do(signature, is_static, reg_map, f);
    }
  }
  
  
  oop nmethod::embeddedOop_at(u_char* p) {
--- 1713,1725 ----
  // called with a frame corresponding to a Java invoke
  void nmethod::preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) {
    if (!method()->is_native()) {
      SimpleScopeDesc ssd(this, fr.pc());
      Bytecode_invoke* call = Bytecode_invoke_at(ssd.method(), ssd.bci());
!     bool has_receiver = call->has_receiver();
      symbolOop signature = call->signature();
!     fr.oops_compiled_arguments_do(signature, has_receiver, reg_map, f);
    }
  }
  
  
  oop nmethod::embeddedOop_at(u_char* p) {