--- a/src/share/vm/runtime/java.cpp	Thu Jan 31 11:32:14 2013 +0100
+++ b/src/share/vm/runtime/java.cpp	Thu Jan 31 15:42:25 2013 +0100
@@ -374,9 +374,12 @@
   if (CITime) {
     CompileBroker::print_times();
   }
-  if(PrintNMethodStatistics) {
-    nmethod::print_statistics();
+
+  if (PrintCodeCache) {
+    MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+    CodeCache::print();
   }
+
 #ifdef COMPILER2
   if (PrintPreciseBiasedLockingStatistics) {
     OptoRuntime::print_named_counters();
@@ -555,6 +558,10 @@
     BeforeExit_lock->notify_all();
   }
 
+  // Shutdown NMT before exit. Otherwise,
+  // it will run into trouble when system destroys static variables.
+  MemTracker::shutdown(MemTracker::NMT_normal);
+
   #undef BEFORE_EXIT_NOT_RUN
   #undef BEFORE_EXIT_RUNNING
   #undef BEFORE_EXIT_DONE