--- a/src/share/vm/code/nmethod.cpp	Wed May 22 17:29:11 2013 +0200
+++ b/src/share/vm/code/nmethod.cpp	Thu May 23 13:51:49 2013 +0200
@@ -124,9 +124,6 @@
 //   PrintC1Statistics, PrintOptoStatistics, LogVMOutput, and LogCompilation.
 // (In the latter two cases, they like other stats are printed to the log only.)
 
-#if !defined(PRODUCT) || defined(GRAAL)
-#define NOT_PRODUCT_OR_GRAAL(code) code
-
 // These variables are put into one block to reduce relocations
 // and make it simpler to print from the debugger.
 static
@@ -216,9 +213,7 @@
                   pc_desc_tests, pc_desc_searches, pc_desc_adds);
   }
 } nmethod_stats;
-#else // !PRODUCT || GRAAL
-#define NOT_PRODUCT_OR_GRAAL(code)
-#endif // !PRODUCT || GRAAL
+
 
 //---------------------------------------------------------------------------------
 
@@ -524,7 +519,7 @@
                                              code_buffer, frame_size,
                                              basic_lock_owner_sp_offset,
                                              basic_lock_sp_offset, oop_maps);
-      NOT_PRODUCT_OR_GRAAL(if (nm != NULL)  nmethod_stats.note_native_nmethod(nm));
+      if (nm != NULL)  nmethod_stats.note_native_nmethod(nm);
       if (PrintAssembly && nm != NULL)
         Disassembler::decode(nm);
     }
@@ -561,7 +556,7 @@
       nm = new (nmethod_size) nmethod(method(), nmethod_size,
                                       &offsets, code_buffer, frame_size);
 
-      NOT_PRODUCT_OR_GRAAL(if (nm != NULL)  nmethod_stats.note_nmethod(nm));
+      if (nm != NULL)  nmethod_stats.note_nmethod(nm);
       if (PrintAssembly && nm != NULL)
         Disassembler::decode(nm);
     }
@@ -645,7 +640,7 @@
         InstanceKlass::cast(klass)->add_dependent_nmethod(nm);
       }
     }
-    NOT_PRODUCT_OR_GRAAL(if (nm != NULL)  nmethod_stats.note_nmethod(nm));
+    if (nm != NULL)  nmethod_stats.note_nmethod(nm);
     if (PrintAssembly && nm != NULL)
       Disassembler::decode(nm);
   }
@@ -3024,7 +3019,6 @@
 #endif // PRODUCT
 
 void nmethod::print_statistics() {
-#if !defined(PRODUCT) || defined(GRAAL)
   ttyLocker ttyl;
   if (xtty != NULL)  xtty->head("statistics type='nmethod'");
   nmethod_stats.print_native_nmethod_stats();
@@ -3033,7 +3027,4 @@
   nmethod_stats.print_pc_stats();
   Dependencies::print_statistics();
   if (xtty != NULL)  xtty->tail("statistics");
-#endif
 }
-
-#undef NOT_PRODUCT_OR_GRAAL