src/hotspot/share/code/nmethod.cpp

*** 624,635 ****
--- 624,639 ----
  #endif
      _compile_id              = compile_id;
      _comp_level              = CompLevel_none;
      _entry_point             = code_begin()          + offsets->value(CodeOffsets::Entry);
      _verified_entry_point    = code_begin()          + offsets->value(CodeOffsets::Verified_Entry);
+ 
+     assert(!method->has_scalarized_args(), "scalarized native wrappers not supported yet"); // for the next 3 fields
+     _value_entry_point       = _entry_point;
      _verified_value_entry_point = _verified_entry_point;
      _verified_value_ro_entry_point = _verified_entry_point;
+ 
      _osr_entry_point         = NULL;
      _exception_cache         = NULL;
      _pc_desc_container.reset_to(NULL);
      _hotness_counter         = NMethodSweeper::hotness_counter_reset_val();
  
*** 784,793 ****
--- 788,798 ----
  #else
      _nmethod_end_offset      = _nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize);
  #endif
      _entry_point             = code_begin()          + offsets->value(CodeOffsets::Entry);
      _verified_entry_point    = code_begin()          + offsets->value(CodeOffsets::Verified_Entry);
+     _value_entry_point       = code_begin()          + offsets->value(CodeOffsets::Value_Entry);
      _verified_value_entry_point = code_begin()       + offsets->value(CodeOffsets::Verified_Value_Entry);
      _verified_value_ro_entry_point = code_begin()    + offsets->value(CodeOffsets::Verified_Value_Entry_RO);
      _osr_entry_point         = code_begin()          + offsets->value(CodeOffsets::OSR_Entry);
      _exception_cache         = NULL;
  
*** 2548,2557 ****
--- 2553,2563 ----
      }
    }
  
    bool print_params = false;
    if (block_begin == entry_point())             stream->print_cr("[Entry Point]");
+   if (block_begin == value_entry_point())       stream->print_cr("[Value Entry Point]");
    if (block_begin == verified_entry_point())          { print_params = true; stream->print_cr("[Verified Entry Point]"); }
    if (block_begin == verified_value_entry_point())    { print_params = true; stream->print_cr("[Verified Value Entry Point]"); }
    if (block_begin == verified_value_ro_entry_point()) { print_params = true; stream->print_cr("[Verified Value Entry Point (RO)]"); }
    if (print_params) {
      print_entry_parameters(stream, block_begin);