Mercurial > hg > truffle

comparison src/share/vm/code/nmethod.cpp @ 12356:359f7e70ae7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children 738023c641c2
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
1880 // Check that the metadata embedded in the nmethod is alive 1880 // Check that the metadata embedded in the nmethod is alive
1881 CheckClass::do_check_class(is_alive, this); 1881 CheckClass::do_check_class(is_alive, this);
1882 #endif 1882 #endif
1883 } 1883 }
1884 1884
1885
1885 // Iterate over metadata calling this function. Used by RedefineClasses 1886 // Iterate over metadata calling this function. Used by RedefineClasses
1886 void nmethod::metadata_do(void f(Metadata*)) { 1887 void nmethod::metadata_do(void f(Metadata*)) {
1887 address low_boundary = verified_entry_point(); 1888 address low_boundary = verified_entry_point();
1888 if (is_not_entrant()) { 1889 if (is_not_entrant()) {
1889 low_boundary += NativeJump::instruction_size; 1890 low_boundary += NativeJump::instruction_size;
2506 CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops()); 2507 CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
2507 } else { 2508 } else {
2508 MutexLocker ml_verify (CompiledIC_lock); 2509 MutexLocker ml_verify (CompiledIC_lock);
2509 ic = CompiledIC_at(this, call_site); 2510 ic = CompiledIC_at(this, call_site);
2510 } 2511 }
2511
2512 PcDesc* pd = pc_desc_at(ic->end_of_call()); 2512 PcDesc* pd = pc_desc_at(ic->end_of_call());
2513 assert(pd != NULL, "PcDesc must exist"); 2513 assert(pd != NULL, "PcDesc must exist");
2514 for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(), 2514 for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(),
2515 pd->obj_decode_offset(), pd->should_reexecute(), pd->rethrow_exception(), 2515 pd->obj_decode_offset(), pd->should_reexecute(), pd->rethrow_exception(),
2516 pd->return_oop()); 2516 pd->return_oop());