comparison src/share/vm/code/dependencies.cpp @ 17677:51e1bb81df86 jdk8u20-b03

Merge
author amurillo
date Tue, 25 Feb 2014 13:02:52 -0800
parents 709018897c81 40353abd7984
children 52b4284cb496 ce8f6bb717c9 9906d432d6db
comparison
equal deleted inserted replaced
17660:9a93fe1babdc 17677:51e1bb81df86
653 if (_code != NULL) { 653 if (_code != NULL) {
654 o = _code->metadata_at(i); 654 o = _code->metadata_at(i);
655 } else { 655 } else {
656 o = _deps->oop_recorder()->metadata_at(i); 656 o = _deps->oop_recorder()->metadata_at(i);
657 } 657 }
658 assert(o == NULL || o->is_metaspace_object(),
659 err_msg("Should be metadata " PTR_FORMAT, o));
660 return o; 658 return o;
661 } 659 }
662 660
663 inline oop Dependencies::DepStream::recorded_oop_at(int i) { 661 inline oop Dependencies::DepStream::recorded_oop_at(int i) {
664 return (_code != NULL) 662 return (_code != NULL)