Mercurial > hg > graal-jvmci-8
comparison src/share/vm/code/dependencies.cpp @ 14273:cb0dc98c287d
Merge
author | kvn |
---|---|
date | Fri, 24 Jan 2014 09:04:24 -0800 |
parents | 757ec609d8d5 3e2b76368121 |
children | 524b54a7f1b5 |
comparison
equal
deleted
inserted
replaced
14272:757ec609d8d5 | 14273:cb0dc98c287d |
---|---|
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) |