src/hotspot/share/oops/generateOopMap.cpp

*** 137,12 ***
    // Compute methods
    int compute_for_parameters(bool is_static, CellTypeState *effect) {
      _idx    = 0;
      _effect = effect;
  
!     if (!is_static)
        effect[_idx++] = CellTypeState::ref;
  
      do_parameters_on(this);
  
      return length();
    };
--- 137,13 ---
    // Compute methods
    int compute_for_parameters(bool is_static, CellTypeState *effect) {
      _idx    = 0;
      _effect = effect;
  
!     if (!is_static) {
        effect[_idx++] = CellTypeState::ref;
+     }
  
      do_parameters_on(this);
  
      return length();
    };

*** 1600,15 ***
      case Bytecodes::_getstatic:         do_field(true,   true,  itr->get_index_u2(), itr->bci(), itr->code()); break;
      case Bytecodes::_putstatic:         do_field(false,  true,  itr->get_index_u2(), itr->bci(), itr->code()); break;
      case Bytecodes::_getfield:          do_field(true,   false, itr->get_index_u2(), itr->bci(), itr->code()); break;
      case Bytecodes::_putfield:          do_field(false,  false, itr->get_index_u2(), itr->bci(), itr->code()); break;
  
      case Bytecodes::_invokevirtual:
!     case Bytecodes::_invokespecial:     do_method(false, false, itr->get_index_u2(), itr->bci(), itr->code()); break;
!     case Bytecodes::_invokestatic:      do_method(true,  false, itr->get_index_u2(), itr->bci(), itr->code()); break;
!     case Bytecodes::_invokedynamic:     do_method(true,  false, itr->get_index_u4(), itr->bci(), itr->code()); break;
-     case Bytecodes::_invokeinterface:   do_method(false, true,  itr->get_index_u2(), itr->bci(), itr->code()); break;
      case Bytecodes::_newarray:
      case Bytecodes::_anewarray:         pp_new_ref(vCTS, itr->bci()); break;
      case Bytecodes::_checkcast:         do_checkcast(); break;
      case Bytecodes::_arraylength:
      case Bytecodes::_instanceof:        pp(rCTS, vCTS); break;
--- 1601,15 ---
      case Bytecodes::_getstatic:         do_field(true,   true,  itr->get_index_u2(), itr->bci(), itr->code()); break;
      case Bytecodes::_putstatic:         do_field(false,  true,  itr->get_index_u2(), itr->bci(), itr->code()); break;
      case Bytecodes::_getfield:          do_field(true,   false, itr->get_index_u2(), itr->bci(), itr->code()); break;
      case Bytecodes::_putfield:          do_field(false,  false, itr->get_index_u2(), itr->bci(), itr->code()); break;
  
+     case Bytecodes::_invokeinterface:
      case Bytecodes::_invokevirtual:
!     case Bytecodes::_invokespecial:     do_method(false, itr->get_index_u2(), itr->bci(), itr->code()); break;
!     case Bytecodes::_invokestatic:      do_method(true , itr->get_index_u2(), itr->bci(), itr->code()); break;
!     case Bytecodes::_invokedynamic:     do_method(true , itr->get_index_u4(), itr->bci(), itr->code()); break;
      case Bytecodes::_newarray:
      case Bytecodes::_anewarray:         pp_new_ref(vCTS, itr->bci()); break;
      case Bytecodes::_checkcast:         do_checkcast(); break;
      case Bytecodes::_arraylength:
      case Bytecodes::_instanceof:        pp(rCTS, vCTS); break;

*** 1624,10 ***
--- 1625,11 ---
                                          break;
  
      case Bytecodes::_areturn:           do_return_monitor_check();
                                          ppop1(refCTS);
                                          break;
+ 
      case Bytecodes::_ifnull:
      case Bytecodes::_ifnonnull:         ppop1(refCTS); break;
      case Bytecodes::_multianewarray:    do_multianewarray(*(itr->bcp()+3), itr->bci()); break;
  
      case Bytecodes::_wide:              fatal("Iterator should skip this bytecode"); break;

*** 1949,17 ***
      out = eff;
    } else {
      out = epsilonCTS;
      i   = copy_cts(in, eff);
    }
!   if (!is_static) in[i++] = CellTypeState::ref;
    in[i] = CellTypeState::bottom;
    assert(i<=3, "sanity check");
    pp(in, out);
  }
  
! void GenerateOopMap::do_method(int is_static, int is_interface, int idx, int bci, Bytecodes::Code bc) {
   // Dig up signature for field in constant pool
    ConstantPool* cp  = _method->constants();
    Symbol* signature   = cp->signature_ref_at(idx, bc);
  
    // Parse method signature
--- 1951,19 ---
      out = eff;
    } else {
      out = epsilonCTS;
      i   = copy_cts(in, eff);
    }
!   if (!is_static) {
+     in[i++] = CellTypeState::ref;
+   }
    in[i] = CellTypeState::bottom;
    assert(i<=3, "sanity check");
    pp(in, out);
  }
  
! void GenerateOopMap::do_method(int is_static, int idx, int bci, Bytecodes::Code bc) {
   // Dig up signature for field in constant pool
    ConstantPool* cp  = _method->constants();
    Symbol* signature   = cp->signature_ref_at(idx, bc);
  
    // Parse method signature