Mercurial > hg > truffle

comparison src/share/vm/code/dependencies.cpp @ 11173:6b0fd0964b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents 2979aaac95af e0c9a1d29eb4
children 096c224171c4
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
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_metadata(), 870 assert(o == NULL || o->is_metaspace_object(),
871 err_msg("Should be perm " PTR_FORMAT, o)); 871 err_msg("Should be metadata " PTR_FORMAT, o));
872 return o; 872 return o;
873 } 873 }
874 874
875 inline oop Dependencies::DepStream::recorded_oop_at(int i) { 875 inline oop Dependencies::DepStream::recorded_oop_at(int i) {
876 return (_code != NULL) 876 return (_code != NULL)
1199 Klass* context_type, 1199 Klass* context_type,
1200 bool participants_hide_witnesses) { 1200 bool participants_hide_witnesses) {
1201 assert(changes.involves_context(context_type), "irrelevant dependency"); 1201 assert(changes.involves_context(context_type), "irrelevant dependency");
1202 Klass* new_type = changes.new_type(); 1202 Klass* new_type = changes.new_type();
1203 1203
1204 count_find_witness_calls(); 1204 (void)count_find_witness_calls();
1205 NOT_PRODUCT(deps_find_witness_singles++); 1205 NOT_PRODUCT(deps_find_witness_singles++);
1206 1206
1207 // Current thread must be in VM (not native mode, as in CI): 1207 // Current thread must be in VM (not native mode, as in CI):
1208 assert(must_be_in_vm(), "raw oops here"); 1208 assert(must_be_in_vm(), "raw oops here");
1209 // Must not move the class hierarchy during this check: 1209 // Must not move the class hierarchy during this check: