# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1354270416 -3600
# Node ID acfca8c77dd297777efe4c88434a7e96aad68943
# Parent  38076efb90624fbf02fb3f2999e584634c1d02e2# Parent  60bef2672469403e15d8c0deff489ad165d2ebd9
Merge

diff -r 38076efb9062 -r acfca8c77dd2 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java
diff -r 38076efb9062 -r acfca8c77dd2 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Fri Nov 30 11:11:13 2012 +0100
+++ b/src/share/vm/code/nmethod.cpp	Fri Nov 30 11:13:36 2012 +0100
@@ -1449,7 +1449,8 @@
   }
 
   if (TraceCreateZombies) {
-    tty->print_cr("nmethod <" INTPTR_FORMAT "> code made %s", this, (state == not_entrant) ? "not entrant" : "zombie");
+    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