*** old/src/share/vm/code/debugInfo.cpp	Wed Sep 16 15:18:14 2015
--- new/src/share/vm/code/debugInfo.cpp	Wed Sep 16 15:18:13 2015

*** 57,67 ****
--- 57,67 ----
  ScopeValue* DebugInfoReadStream::read_object_value() {
    int id = read_int();
  #ifdef ASSERT
    assert(_obj_pool != NULL, "object pool does not exist");
    for (int i = _obj_pool->length() - 1; i >= 0; i--) {
!     assert(((ObjectValue*) _obj_pool->at(i))->id() != id, "should not be read twice");
!     assert(_obj_pool->at(i)->as_ObjectValue()->id() != id, "should not be read twice");
    }
  #endif
    ObjectValue* result = new ObjectValue(id);
    // Cache the object since an object field could reference it.
    _obj_pool->push(result);

*** 71,81 ****
--- 71,81 ----
  
  ScopeValue* DebugInfoReadStream::get_cached_object() {
    int id = read_int();
    assert(_obj_pool != NULL, "object pool does not exist");
    for (int i = _obj_pool->length() - 1; i >= 0; i--) {
!     ObjectValue* ov = (ObjectValue*) _obj_pool->at(i);
!     ObjectValue* ov = _obj_pool->at(i)->as_ObjectValue();
      if (ov->id() == id) {
        return ov;
      }
    }
    ShouldNotReachHere();