truffle: src/share/vm/code/nmethod.cpp comparison

comparison src/share/vm/code/nmethod.cpp @ 13086:096c224171c4

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 20 Nov 2013 00:10:38 +0100
parents	ca33948fb804 78da3894b86f
children	f9f4503a4ab5

comparison

equal deleted inserted replaced

-:92b7ec34ddfa
+:096c224171c4
 // NMethod statistics
 // They are printed under various flags, including:
 //   PrintC1Statistics, PrintOptoStatistics, LogVMOutput, and LogCompilation.
 // (In the latter two cases, they like other stats are printed to the log only.)
+#ifndef PRODUCT
 // These variables are put into one block to reduce relocations
 // and make it simpler to print from the debugger.
 struct java_nmethod_stats_struct {
 int nmethod_count;
 int total_size;
 #endif
 {
 unknown_java_nmethod_stats.note_nmethod(nm);
 }
 }
+#endif
 //---------------------------------------------------------------------------------
 ExceptionCache::ExceptionCache(Handle exception, address pc, address handler) {
 nm = new (native_nmethod_size) nmethod(method(), native_nmethod_size,
 compile_id, &offsets,
 code_buffer, frame_size,
 basic_lock_owner_sp_offset,
 basic_lock_sp_offset, oop_maps);
-if (nm != NULL)  native_nmethod_stats.note_native_nmethod(nm);
+NOT_PRODUCT(if (nm != NULL)  note_java_nmethod(nm));
 if (PrintAssembly && nm != NULL) {
 Disassembler::decode(nm);
 }
 }
 // verify nmethod
 offsets.set_value(CodeOffsets::Frame_Complete, frame_complete);
 nm = new (nmethod_size) nmethod(method(), nmethod_size,
 &offsets, code_buffer, frame_size);
-if (nm != NULL)  note_java_nmethod(nm);
+NOT_PRODUCT(if (nm != NULL)  note_java_nmethod(nm));
 if (PrintAssembly && nm != NULL) {
 Disassembler::decode(nm);
 }
 }
 // verify nmethod
 }
 // record this nmethod as dependent on this klass
 InstanceKlass::cast(klass)->add_dependent_nmethod(nm);
 }
-}
+NOT_PRODUCT(if (nm != NULL)  note_java_nmethod(nm));
-if (nm != NULL)  note_java_nmethod(nm);
+if (PrintAssembly) {
-if (PrintAssembly && nm != NULL) {
+Disassembler::decode(nm);
-Disassembler::decode(nm);
+}
 }
 }
+// Do verification and logging outside CodeCache_lock.
-// verify nmethod
-debug_only(if (nm) nm->verify();) // might block
 if (nm != NULL) {
+// Safepoints in nmethod::verify aren't allowed because nm hasn't been installed yet.
+DEBUG_ONLY(nm->verify();)
 nm->log_new_nmethod();
 }
-// done
 return nm;
 }
 // For native wrappers
 // The Method* is gone at this point
 assert(_method == NULL, "Tautology");
 set_osr_link(NULL);
 //set_scavenge_root_link(NULL); // done by prune_scavenge_root_nmethods
-NMethodSweeper::notify();
+NMethodSweeper::report_state_change(this);
 }
 void nmethod::invalidate_osr_method() {
 assert(_entry_bci != InvocationEntryBci, "wrong kind of nmethod");
 // Remove from list of active nmethods
 if (PrintCompilation && _state != unloaded) {
 print_on(tty, _state == zombie ? "made zombie" : "made not entrant");
 }
 }
-// Common functionality for both make_not_entrant and make_zombie
+/**
+* Common functionality for both make_not_entrant and make_zombie
+*/
 bool nmethod::make_not_entrant_or_zombie(unsigned int state) {
 assert(state == zombie || state == not_entrant, "must be zombie or not_entrant");
 assert(!is_zombie(), "should not already be a zombie");
 // Make sure neither the nmethod nor the method is flushed in case of a safepoint in code below.
 if (TraceCreateZombies) {
 ResourceMark m;
 tty->print_cr("nmethod <" INTPTR_FORMAT "> %s code made %s", this, this->method()->name_and_sig_as_C_string(), (state == not_entrant) ? "not entrant" : "zombie");
 }
-// Make sweeper aware that there is a zombie method that needs to be removed
+NMethodSweeper::report_state_change(this);
-NMethodSweeper::notify();
 return true;
 }
 void nmethod::flush() {
 // Note that there are no valid oops in the nmethod anymore.
 verify_scopes();
 }
 void nmethod::verify_interrupt_point(address call_site) {
-// This code does not work in release mode since
+// Verify IC only when nmethod installation is finished.
-// owns_lock only is available in debug mode.
+bool is_installed = (method()->code() == this) // nmethod is in state 'alive' and installed
-CompiledIC* ic = NULL;
+|| !this->is_in_use();     // nmethod is installed, but not in 'alive' state
-Thread *cur = Thread::current();
+if (is_installed) {
-if (CompiledIC_lock->owner() == cur ||
+Thread *cur = Thread::current();
-((cur->is_VM_thread() || cur->is_ConcurrentGC_thread()) &&
+if (CompiledIC_lock->owner() == cur ||
-SafepointSynchronize::is_at_safepoint())) {
+((cur->is_VM_thread() || cur->is_ConcurrentGC_thread()) &&
-ic = CompiledIC_at(this, call_site);
+SafepointSynchronize::is_at_safepoint())) {
-CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
+CompiledIC_at(this, call_site);
-} else {
+CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
-MutexLocker ml_verify (CompiledIC_lock);
+} else {
-ic = CompiledIC_at(this, call_site);
+MutexLocker ml_verify (CompiledIC_lock);
-}
+CompiledIC_at(this, call_site);
-PcDesc* pd = pc_desc_at(ic->end_of_call());
+}
+}
+PcDesc* pd = pc_desc_at(nativeCall_at(call_site)->return_address());
 assert(pd != NULL, "PcDesc must exist");
 for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(),
 pd->obj_decode_offset(), pd->should_reexecute(), pd->rethrow_exception(),
 pd->return_oop());
 !sd->is_top(); sd = sd->sender()) {
 void nmethod::print_nul_chk_table() {
 ImplicitExceptionTable(this).print(code_begin());
 }
-#endif // PRODUCT
 void nmethod::print_statistics() {
 ttyLocker ttyl;
 if (xtty != NULL)  xtty->head("statistics type='nmethod'");
 native_nmethod_stats.print_native_nmethod_stats();
 #ifdef COMPILER1
 DebugInformationRecorder::print_statistics();
 pc_nmethod_stats.print_pc_stats();
 Dependencies::print_statistics();
 if (xtty != NULL)  xtty->tail("statistics");
 }
+#endif // PRODUCT

Mercurial > hg > truffle

comparison src/share/vm/code/nmethod.cpp @ 13086:096c224171c4