diff -r 8397081c7ac1 -r 6ee479178066 src/share/vm/utilities/macros.hpp
--- a/src/share/vm/utilities/macros.hpp	Fri Aug 27 21:31:15 2010 -0700
+++ b/src/share/vm/utilities/macros.hpp	Tue Aug 31 03:14:00 2010 -0700
@@ -76,12 +76,14 @@
 #ifdef PRODUCT
 #define PRODUCT_ONLY(code) code
 #define NOT_PRODUCT(code)
+#define NOT_PRODUCT_ARG(arg)
 #define PRODUCT_RETURN  {}
 #define PRODUCT_RETURN0 { return 0; }
 #define PRODUCT_RETURN_(code) { code }
 #else // PRODUCT
 #define PRODUCT_ONLY(code)
 #define NOT_PRODUCT(code) code
+#define NOT_PRODUCT_ARG(arg) arg,
 #define PRODUCT_RETURN  /*next token must be ;*/
 #define PRODUCT_RETURN0 /*next token must be ;*/
 #define PRODUCT_RETURN_(code)  /*next token must be ;*/