comparison src/share/vm/code/dependencies.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 51e1bb81df86
children 6eda3b299460
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
865 if (_code != NULL) { 865 if (_code != NULL) {
866 o = _code->metadata_at(i); 866 o = _code->metadata_at(i);
867 } else { 867 } else {
868 o = _deps->oop_recorder()->metadata_at(i); 868 o = _deps->oop_recorder()->metadata_at(i);
869 } 869 }
870 assert(o == NULL || o->is_metaspace_object(),
871 err_msg("Should be metadata " PTR_FORMAT, o));
872 return o; 870 return o;
873 } 871 }
874 872
875 inline oop Dependencies::DepStream::recorded_oop_at(int i) { 873 inline oop Dependencies::DepStream::recorded_oop_at(int i) {
876 return (_code != NULL) 874 return (_code != NULL)