src/hotspot/share/code/debugInfo.cpp

*** 160,10 ***
--- 160,11 ---
  }
  
  void ObjectValue::read_object(DebugInfoReadStream* stream) {
    _is_root = stream->read_bool();
    _klass = read_from(stream);
+   _is_init = read_from(stream);
    assert(_klass->is_constant_oop(), "should be constant java mirror oop");
    int length = stream->read_int();
    for (int i = 0; i < length; i++) {
      ScopeValue* val = read_from(stream);
      _field_values.append(val);

*** 178,10 ***
--- 179,15 ---
      set_visited(true);
      stream->write_int(is_auto_box() ? AUTO_BOX_OBJECT_CODE : OBJECT_CODE);
      stream->write_int(_id);
      stream->write_bool(_is_root);
      _klass->write_on(stream);
+     if (_is_init == nullptr) {
+       // MarkerValue is used for null-free objects
+       _is_init = new MarkerValue();
+     }
+     _is_init->write_on(stream);
      int length = _field_values.length();
      stream->write_int(length);
      for (int i = 0; i < length; i++) {
        _field_values.at(i)->write_on(stream);
      }