comparison src/share/vm/runtime/sharedRuntime.cpp @ 1563:1a5913bf5e19

6951083: oops and relocations should part of nmethod not CodeBlob Summary: This moves the oops from Codeblob to nmethod. Reviewed-by: kvn, never
author twisti
date Thu, 20 May 2010 06:34:23 -0700
parents cd5dbf694d45
children 61b2245abf36
comparison
equal deleted inserted replaced
1544:1a88d3c58e1d 1563:1a5913bf5e19
1433 // there. If you're lucky you'll get the assert in the bugid, if not you've 1433 // there. If you're lucky you'll get the assert in the bugid, if not you've
1434 // just made a call site that could be megamorphic into a monomorphic site 1434 // just made a call site that could be megamorphic into a monomorphic site
1435 // for the rest of its life! Just another racing bug in the life of 1435 // for the rest of its life! Just another racing bug in the life of
1436 // fixup_callers_callsite ... 1436 // fixup_callers_callsite ...
1437 // 1437 //
1438 RelocIterator iter(cb, call->instruction_address(), call->next_instruction_address()); 1438 RelocIterator iter(nm, call->instruction_address(), call->next_instruction_address());
1439 iter.next(); 1439 iter.next();
1440 assert(iter.has_current(), "must have a reloc at java call site"); 1440 assert(iter.has_current(), "must have a reloc at java call site");
1441 relocInfo::relocType typ = iter.reloc()->type(); 1441 relocInfo::relocType typ = iter.reloc()->type();
1442 if ( typ != relocInfo::static_call_type && 1442 if ( typ != relocInfo::static_call_type &&
1443 typ != relocInfo::opt_virtual_call_type && 1443 typ != relocInfo::opt_virtual_call_type &&